Commit 25ba2653 authored Jul 20, 2015 by Johan Hedberg Committed by Marcel Holtmann Jul 23, 2015

Bluetooth: Fix NULL pointer dereference in smp_conn_security

The l2cap_conn->smp pointer may be NULL for various valid reasons where SMP has
failed to initialize properly. One such scenario is when crypto support is
missing, another when the adapter has been powered on through a legacy method.
The smp_conn_security() function should have the appropriate check for this
situation to avoid NULL pointer dereferences.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org # 4.0+

parent c5dfd654

net/bluetooth/smp.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2312,6 +2312,10 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
		return 1;

		chan = conn->smp;
		if (!chan) {
		BT_ERR("SMP security requested but not available");
		return 1;
		}

		if (!hci_dev_test_flag(hcon->hdev, HCI_LE_ENABLED))
		return 1;