Bluetooth: Fix dereferencing conn variable before NULL check
Subsystems (2)
PATCH 1/1 Bluetooth: Fix dereferencing conn variable before NULL check
From: Johan Hedberg <[email protected]>
This patch fixes the following type of static analyzer warning (and probably a real bug as well as the NULL check should be there for a reason):
net/bluetooth/smp.c:1182 smp_conn_security() warn: variable dereferenced before check 'conn' (see line 1174)
Signed-off-by Johan Hedberg <[email protected]>
--- net/bluetooth/smp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bluetooth/smp.c +3 -1
@@ -1210,7 +1210,7 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)int smp_conn_security (struct hci_conn *hcon,__u8 sec_level) {struct l2cap_conn *conn = hcon->l2cap_data; -struct l2cap_chan *chan = conn->smp; +struct l2cap_chan *chan;struct smp_chan *smp;__u8 authreq;int ret;
@@ -1221,6 +1221,8 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)if (!conn)return 1 ; + chan = conn->smp; +if (!test_bit (HCI_LE_ENABLED , &hcon->hdev->dev_flags))return 1 ;
Signature · 1 line
1.9.3
Marcel Holtmann
maintainerHi Johan,
Quoted 10 lines
This patch fixes the following type of static analyzer warning (and probably a real bug as well as the NULL check should be there for a reason):
net/bluetooth/smp.c:1182smp_conn_security()warn: variable dereferenced before check 'conn' (see line 1174)Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/smp.c| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel