Skip to content

Commit

Permalink
Bluetooth: Fix checking for proper key->master value in Load LTKs
Browse files Browse the repository at this point in the history
The allowed values for the key->master parameter in the Load LTKs
command are 0x00 and 0x01. If there is a key in the list with some other
value the command should fail with a proper invalid params response.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Johan Hedberg authored and Gustavo Padovan committed Jan 23, 2013
1 parent e57e619 commit 54ad6d8
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 54ad6d8

Please sign in to comment.