2 files changed, 7 insertions, 0 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 8097559ebb48..b0b760dd66a3 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4365,8 +4365,11 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
          * using a distributed LTK.
          */
         if (ltk->type == SMP_STK) {
+                set_bit(HCI_CONN_STK_ENCRYPT, &conn->flags);
                 list_del(&ltk->list);
                 kfree(ltk);
+        } else {
+                clear_bit(HCI_CONN_STK_ENCRYPT, &conn->flags);
         }
 
         hci_dev_unlock(hdev);
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 6ce7785a2708..68e6f245581c 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -538,6 +538,7 @@ static u8 smp_random(struct smp_chan *smp)
 
                 hci_le_start_enc(hcon, ediv, rand, stk);
                 hcon->enc_key_size = smp->enc_key_size;
+                set_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags);
         } else {
                 u8 stk[16], auth;
                 __le64 rand = 0;
@@ -856,6 +857,9 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)
         hci_le_start_enc(hcon, key->ediv, key->rand, key->val);
         hcon->enc_key_size = key->enc_size;
 
+        /* We never store STKs for master role, so clear this flag */
+        clear_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags);
+
         return true;
 }