]> Pileus Git - ~andy/linux/commitdiff
Bluetooth: Don't distribute keys in case of Encryption Failure
authorHemant Gupta <hemant.gupta@stericsson.com>
Wed, 18 Apr 2012 09:16:26 +0000 (14:46 +0530)
committerGustavo Padovan <gustavo@padovan.org>
Wed, 9 May 2012 04:40:36 +0000 (01:40 -0300)
SMP Keys should only be distributeed when encryption is successful.

Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
net/bluetooth/l2cap_core.c

index 913cec3e52d704c567aa5ebe1d9558793800c0a7..ce93dcf0c2db9af91e33a134a374679a5153c3ce 100644 (file)
@@ -4813,7 +4813,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
        BT_DBG("conn %p", conn);
 
        if (hcon->type == LE_LINK) {
-               smp_distribute_keys(conn, 0);
+               if (!status && encrypt)
+                       smp_distribute_keys(conn, 0);
                cancel_delayed_work(&conn->security_timer);
        }