Commit 61b3b2b6 authored Mar 24, 2014 by Johan Hedberg Committed by Marcel Holtmann Mar 24, 2014

Bluetooth: Fix potential NULL pointer dereference in smp_conn_security



The smp pointer might not be initialized for jumps to the "done" label
in the smp_conn_security function. Furthermore doing the set_bit after
done might "overwrite" a previous value of the flag in case pairing was
already in progress. This patch moves the call to set_bit before the
label so that it is only done for a newly created smp context (as
returned by smp_chan_create).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 1d98bf4f

net/bluetooth/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -930,9 +930,9 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
		smp_send_cmd(conn, SMP_CMD_SECURITY_REQ, sizeof(cp), &cp);
		}

		done:
		set_bit(SMP_FLAG_INITIATOR, &smp->smp_flags);

		done:
		hcon->pending_sec_level = sec_level;

		return 0;