2 files changed, 28 insertions, 3 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 6c3220e9484f..2fa9f2b2bee3 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3160,6 +3160,10 @@ static bool hci_persistent_key(struct hci_dev *hdev, struct hci_conn *conn,
         if (!conn)
                 return true;
 
+        /* BR/EDR key derived using SC from an LE link */
+        if (conn->type == LE_LINK)
+                return true;
+
         /* Neither local nor remote side had no-bonding as requirement */
         if (conn->auth_type > 0x01 && conn->remote_auth > 0x01)
                 return true;
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index b6cdb553ccd3..a322019610eb 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -965,9 +965,30 @@ static void smp_notify_keys(struct l2cap_conn *conn)
         }
 
         if (smp->link_key) {
-                hci_add_link_key(hdev, smp->conn->hcon, &hcon->dst,
-                                 smp->link_key, HCI_LK_AUTH_COMBINATION_P256,
-                                 0, NULL);
+                struct link_key *key;
+                u8 type;
+
+                if (test_bit(SMP_FLAG_DEBUG_KEY, &smp->flags))
+                        type = HCI_LK_DEBUG_COMBINATION;
+                else if (hcon->sec_level == BT_SECURITY_FIPS)
+                        type = HCI_LK_AUTH_COMBINATION_P256;
+                else
+                        type = HCI_LK_UNAUTH_COMBINATION_P256;
+
+                key = hci_add_link_key(hdev, smp->conn->hcon, &hcon->dst,
+                                       smp->link_key, type, 0, &persistent);
+                if (key) {
+                        mgmt_new_link_key(hdev, key, persistent);
+
+                        /* Don't keep debug keys around if the relevant
+                         * flag is not set.
+                         */
+                        if (!test_bit(HCI_KEEP_DEBUG_KEYS, &hdev->dev_flags) &&
+                            key->type == HCI_LK_DEBUG_COMBINATION) {
+                                list_del_rcu(&key->list);
+                                kfree_rcu(key, rcu);
+                        }
+                }
         }
 }