From: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
Subject: [PATCH v2 1/2] gateway: Fix crash if SCO connection fails
Date: Tue, 21 Feb 2012 17:46:49 +0100 [thread overview]
Message-ID: <1329842810-13449-2-git-send-email-frederic.dalleau@linux.intel.com> (raw)
In-Reply-To: <1329842810-13449-1-git-send-email-frederic.dalleau@linux.intel.com>
In some situations, a connect callback is created, but
this callback is not added to media_owner. Thus when the owner
is destroyed and at rfcomm disconnect, the callback is executed
with an invalid pointer.
---
audio/gateway.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/audio/gateway.c b/audio/gateway.c
index 163f7b5..131f93f 100644
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -836,12 +836,9 @@ unsigned int gateway_request_stream(struct audio_device *dev,
gateway_stream_cb_t cb, void *user_data)
{
struct gateway *gw = dev->gateway;
- unsigned int id;
GError *err = NULL;
GIOChannel *io;
- id = connect_cb_new(gw, cb, user_data);
-
if (!gw->rfcomm)
get_records(dev);
else if (!gw->sco) {
@@ -858,7 +855,7 @@ unsigned int gateway_request_stream(struct audio_device *dev,
} else
g_idle_add(request_stream_cb, dev);
- return id;
+ return connect_cb_new(gw, cb, user_data);
}
int gateway_config_stream(struct audio_device *dev, gateway_stream_cb_t cb,
--
1.7.5.4
next prev parent reply other threads:[~2012-02-21 16:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 16:46 [PATCH v2 0/2] gateway: Fix crash if SCO connection fails Frédéric Dalleau
2012-02-21 16:46 ` Frédéric Dalleau [this message]
2012-02-22 8:43 ` [PATCH v2 1/2] " Luiz Augusto von Dentz
2012-02-21 16:46 ` [PATCH v2 2/2] media: register disconnect watch at transport add Frédéric Dalleau
2012-02-22 8:42 ` Luiz Augusto von Dentz
2012-03-08 10:14 ` [PATCH v2 0/2] gateway: Fix crash if SCO connection fails Dalleau, Frederic
2012-03-08 23:58 ` Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329842810-13449-2-git-send-email-frederic.dalleau@linux.intel.com \
--to=frederic.dalleau@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).