Bluetooth: Fix potential NULL pointer dereference in smp_conn_security
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 24 Mar 2014 15:36:25 +0000 (17:36 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 24 Mar 2014 15:43:47 +0000 (08:43 -0700)
commit61b3b2b6f4d754aaa84606e041556369bb5a107b
treeebabc4b015fe70c6c584a91dd0a1f589308332bc
parent1d98bf4fda5f76563a9718b59e3ac5a65fd36a51
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>
net/bluetooth/smp.c