1 files changed, 9 insertions, 5 deletions

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index a8b971b75a67..391888b88a92 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -401,6 +401,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
                                 SMP_MAX_ENC_KEY_SIZE - conn->smp_key_size);
 
                 hci_le_start_enc(hcon, ediv, rand, stk);
+                hcon->enc_key_size = conn->smp_key_size;
         } else {
                 u8 stk[16], r[16], rand[8];
                 __le16 ediv;
@@ -417,7 +418,8 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
                 memset(stk + conn->smp_key_size, 0,
                                 SMP_MAX_ENC_KEY_SIZE - conn->smp_key_size);
 
-                hci_add_ltk(conn->hcon->hdev, 0, conn->dst, ediv, rand, stk);
+                hci_add_ltk(conn->hcon->hdev, 0, conn->dst, conn->smp_key_size,
+                                                        ediv, rand, stk);
         }
 
         return 0;
@@ -487,6 +489,8 @@ int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level)
 
                         hci_le_start_enc(hcon, master->ediv, master->rand,
                                                                 key->val);
+                        hcon->enc_key_size = key->pin_len;
+
                         goto done;
                 }
 
@@ -528,8 +532,8 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
 
         skb_pull(skb, sizeof(*rp));
 
-        hci_add_ltk(conn->hcon->hdev, 1, conn->src, rp->ediv,
-                                                rp->rand, conn->tk);
+        hci_add_ltk(conn->hcon->hdev, 1, conn->src, conn->smp_key_size,
+                                                rp->ediv, rp->rand, conn->tk);
 
         smp_distribute_keys(conn, 1);
 
@@ -654,8 +658,8 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
 
                 smp_send_cmd(conn, SMP_CMD_ENCRYPT_INFO, sizeof(enc), &enc);
 
-                hci_add_ltk(conn->hcon->hdev, 1, conn->dst, ediv,
-                                                        ident.rand, enc.ltk);
+                hci_add_ltk(conn->hcon->hdev, 1, conn->dst, conn->smp_key_size,
+                                                ediv, ident.rand, enc.ltk);
 
                 ident.ediv = cpu_to_le16(ediv);