---

yaml --- r: 352251 b: refs/heads/master c: 54ad6d8 h: refs/heads/master i: 352249: 2d65bc3 352247: f582945 v: v3
git-mirror · Jan 23, 2013 · 6922928 · 6922928
1 parent 2aa14f2
commit 6922928
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57e619f463e7841940ef1b98969e23f71f5ee8a
+refs/heads/master: 54ad6d8a5afe1a6d162d8d229a3d8fc48b254d24
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
@@ -2721,6 +2721,15 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
 
 	BT_DBG("%s key_count %u", hdev->name, key_count);
 
+	for (i = 0; i < key_count; i++) {
+		struct mgmt_ltk_info *key = &cp->keys[i];
+
+		if (key->master != 0x00 && key->master != 0x01)
+			return cmd_status(sk, hdev->id,
+					  MGMT_OP_LOAD_LONG_TERM_KEYS,
+					  MGMT_STATUS_INVALID_PARAMS);
+	}
+
 	hci_dev_lock(hdev);
 
 	hci_smp_ltks_clear(hdev);