From: Johan Hedberg <johan.hedberg@intel.com>
Date: Mon, 24 Mar 2014 15:36:25 +0000 (+0200)
Subject: Bluetooth: Fix potential NULL pointer dereference in smp_conn_security
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=61b3b2b6f4d754aaa84606e041556369bb5a107b;p=deliverable%2Flinux.git

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>
---

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 10a8e622ab2b..c654c5880912 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -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;