From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 07/10] android/hidhost: Shutdown ctrl_io channel if intr_io fails
Date: Thu, 28 Nov 2013 16:38:03 +0200 [thread overview]
Message-ID: <1385649486-19978-7-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1385649486-19978-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This fix possible memory leak.
---
android/hidhost.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/android/hidhost.c b/android/hidhost.c
index d50c5b8..1f5aa5d 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -1219,8 +1219,12 @@ bool bt_hid_register(int sk, const bdaddr_t *addr)
BT_IO_OPT_INVALID);
if (!intr_io) {
error("Failed to listen on intr channel: %s", err->message);
- g_io_channel_unref(ctrl_io);
g_error_free(err);
+
+ g_io_channel_shutdown(ctrl_io, TRUE, NULL);
+ g_io_channel_unref(ctrl_io);
+ ctrl_io = NULL;
+
return false;
}
--
1.8.3.2
next prev parent reply other threads:[~2013-11-28 14:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-28 14:37 [PATCH 01/10] android: Avoid memory leak warnings for event_loop Andrei Emeltchenko
2013-11-28 14:37 ` [PATCH 02/10] android/main: Remove timeout source on exit Andrei Emeltchenko
2013-11-28 14:37 ` [PATCH 03/10] android/main: Remove signal " Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 04/10] android/main: Free enabled string " Andrei Emeltchenko
2013-11-29 8:29 ` Johan Hedberg
2013-11-28 14:38 ` [PATCH 05/10] android/socket: Cleanup sockets on unregister Andrei Emeltchenko
2013-11-29 8:26 ` Johan Hedberg
2013-11-28 14:38 ` [PATCH 06/10] android/socket: Fix rfsock lists Andrei Emeltchenko
2013-11-28 14:38 ` Andrei Emeltchenko [this message]
2013-11-28 14:38 ` [PATCH 08/10] android/socket: Strip extra log messages Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 09/10] android/socket: Avoid double close of file descriptor Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 10/10] android/socket: Remove unneeded code Andrei Emeltchenko
2013-11-29 8:31 ` 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=1385649486-19978-7-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.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