Commit 8cf9fa12 authored Jan 29, 2013 by Johan Hedberg Committed by Gustavo Padovan Jan 31, 2013

Bluetooth: Fix handling of unexpected SMP PDUs



The conn->smp_chan pointer can be NULL if SMP PDUs arrive at unexpected
moments. To avoid NULL pointer dereferences the code should be checking
for this and disconnect if an unexpected SMP PDU arrives. This patch
fixes the issue by adding a check for conn->smp_chan for all other PDUs
except pairing request and security request (which are are the first
PDUs to come to initialize the SMP context).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
CC: stable@vger.kernel.org
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent b7e98b51

net/bluetooth/smp.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -859,6 +859,19 @@ int smp_sig_channel(struct l2cap_conn conn, struct sk_buff skb)

		skb_pull(skb, sizeof(code));

		/*
		* The SMP context must be initialized for all other PDUs except
		* pairing and security requests. If we get any other PDU when
		* not initialized simply disconnect (done if this function
		* returns an error).
		*/
		if (code != SMP_CMD_PAIRING_REQ && code != SMP_CMD_SECURITY_REQ &&
		!conn->smp_chan) {
		BT_ERR("Unexpected SMP command 0x%02x. Disconnecting.", code);
		kfree_skb(skb);
		return -ENOTSUPP;
		}

		switch (code) {
		case SMP_CMD_PAIRING_REQ:
		reason = smp_cmd_pairing_req(conn, skb);

Admin message