summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/bnep
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-02-03 10:01:13 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-02-03 09:02:12 +0100
commit88d9077c27d0c1a7c022d9dc987640beecf23560 (patch)
tree0e72093db43abd243deaf2bdaf054262e7694feb /net/bluetooth/bnep
parent8f0c304c693c5a9759ed6ae50d07d4590dad5ae7 (diff)
downloadlinux-stable-88d9077c27d0c1a7c022d9dc987640beecf23560.tar.gz
linux-stable-88d9077c27d0c1a7c022d9dc987640beecf23560.tar.bz2
linux-stable-88d9077c27d0c1a7c022d9dc987640beecf23560.zip
Bluetooth: Fix potential NULL dereference
The bnep_get_device function may be triggered by an ioctl just after a connection has gone down. In such a case the respective L2CAP chan->conn pointer will get set to NULL (by l2cap_chan_del). This patch adds a missing NULL check for this case in the bnep_get_device() function. Reported-by: Patrik Flykt <patrik.flykt@linux.intel.com> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/bnep')
-rw-r--r--net/bluetooth/bnep/core.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index ce82722d049b..05f57e491ccb 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -511,13 +511,12 @@ static int bnep_session(void *arg)
static struct device *bnep_get_device(struct bnep_session *session)
{
- struct hci_conn *conn;
+ struct l2cap_conn *conn = l2cap_pi(session->sock->sk)->chan->conn;
- conn = l2cap_pi(session->sock->sk)->chan->conn->hcon;
- if (!conn)
+ if (!conn || !conn->hcon)
return NULL;
- return &conn->dev;
+ return &conn->hcon->dev;
}
static struct device_type bnep_type = {