]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Bluetooth: Fix encryption key size for peripheral role
authorAndre Guedes <andre.guedes@openbossa.org>
Wed, 31 Jul 2013 19:25:29 +0000 (16:25 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Mon, 16 Sep 2013 17:36:56 +0000 (14:36 -0300)
This patch fixes the connection encryption key size information when
the host is playing the peripheral role. We should set conn->enc_key_
size in hci_le_ltk_request_evt, otherwise it is left uninitialized.

Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/hci_event.c

index 04967248f8997dfeab50b7efb99f149995b378ff..8db3e89fae354aebb67c6ea7172a3e2e1926b66d 100644 (file)
@@ -3561,6 +3561,8 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
        else
                conn->pending_sec_level = BT_SECURITY_MEDIUM;
 
+       conn->enc_key_size = ltk->enc_size;
+
        hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
 
        if (ltk->type & HCI_SMP_STK) {