Bluetooth: Fix potential NULL dereference
Subsystems (2)
PATCH 1/1 Bluetooth: Fix potential NULL dereference
From: Johan Hedberg <[email protected]>
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.
--- net/bluetooth/bnep/core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/bluetooth/bnep/core.c +3 -4
@@ -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 = {
Signature · 1 line
2.1.0
Marcel Holtmann
maintainerHi Johan,
Quoted 10 lines
The
bnep_get_devicefunction may be triggered by an ioctl just after a connection has gone down. In such a case the respective L2CAPchan->connpointer will get set to NULL (byl2cap_chan_del). This patch adds a missing NULL check for this case in thebnep_get_device()function.Reported-by Patrik Flykt <[email protected]>Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/bnep/core.c| 7 +++----1 file changed, 3 insertions(+), 4 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel