From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 4/6] android/socket: Check create_rfsock returns valid structure
Date: Tue, 26 Nov 2013 16:05:48 +0200 [thread overview]
Message-ID: <1385474750-18331-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1385474750-18331-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
android/socket.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/android/socket.c b/android/socket.c
index c4f14ab..772afaa 100644
--- a/android/socket.c
+++ b/android/socket.c
@@ -638,6 +638,11 @@ static void accept_cb(GIOChannel *io, GError *err, gpointer user_data)
sock_acc = g_io_channel_unix_get_fd(io);
rfsock_acc = create_rfsock(sock_acc, &hal_fd);
+ if (!rfsock_acc) {
+ g_io_channel_shutdown(io, TRUE, NULL);
+ return;
+ }
+
connections = g_list_append(connections, rfsock_acc);
DBG("rfsock: fd %d real_sock %d chan %u sock %d",
@@ -898,8 +903,11 @@ static int handle_connect(void *buf)
DBG("");
- android2bdaddr(cmd->bdaddr, &dst);
rfsock = create_rfsock(-1, &hal_fd);
+ if (!rfsock)
+ return -1;
+
+ android2bdaddr(cmd->bdaddr, &dst);
bacpy(&rfsock->dst, &dst);
memset(&uuid, 0, sizeof(uuid));
--
1.8.3.2
next prev parent reply other threads:[~2013-11-26 14:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-26 14:05 [PATCH 1/6] android/socket: Make profile struct const Andrei Emeltchenko
2013-11-26 14:05 ` [PATCH 2/6] android/socket: Use security level for connect / listen Andrei Emeltchenko
2013-11-26 14:05 ` [PATCH 3/6] android/socket: Handle Android events for server socket Andrei Emeltchenko
2013-11-26 15:46 ` Johan Hedberg
2013-11-27 8:00 ` Andrei Emeltchenko
2013-11-27 8:21 ` Johan Hedberg
2013-11-27 8:29 ` Andrei Emeltchenko
2013-11-27 9:03 ` Johan Hedberg
2013-11-26 14:05 ` Andrei Emeltchenko [this message]
2013-11-27 10:55 ` [PATCH 4/6] android/socket: Check create_rfsock returns valid structure Johan Hedberg
2013-11-26 14:05 ` [PATCH 5/6] android/hal-sock: Check uuid before dereference Andrei Emeltchenko
2013-11-27 10:54 ` Johan Hedberg
2013-11-26 14:05 ` [PATCH 6/6] android: Do not dereference possible NULL pointer Andrei Emeltchenko
2013-11-27 10:52 ` 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=1385474750-18331-4-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