[PATCH 5/6] Bluetooth: Fix ignoring debug keys in mgmt_load_link_keys

[johan.hedberg@gmail.com]

From: Johan Hedberg <johan.hedberg@intel.com>

If support for debug keys is not enabled we should simply ignore any
debug keys fed to us from user space using the mgmt_load_link_keys
command.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 net/bluetooth/mgmt.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 634b44ddc9f9..49c9a4dbfd15 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2426,6 +2426,11 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
 	for (i = 0; i < key_count; i++) {
 		struct mgmt_link_key_info *key = &cp->keys[i];
 
+		/* Ignore debug keys if support is not enabled */
+		if (key->type == HCI_LK_DEBUG_COMBINATION &&
+		    !test_bit(HCI_KEEP_DEBUG_KEYS, &hdev->flags))
+			continue;
+
 		hci_add_link_key(hdev, NULL, &key->addr.bdaddr, key->val,
 				 key->type, key->pin_len, NULL);
 	}
-- 
1.9.3