summaryrefslogtreecommitdiff
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-02-18 17:14:35 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-02-18 08:58:20 -0800
commita7ec73386ce2a8ab351ee8ab6a1e5475f72617dc (patch)
tree2a35779088a000bf99838892f1a3e592314d9428 /net/bluetooth/mgmt.c
parentb7d448d74a09af412d778918415fe2ea4d5c2de4 (diff)
downloadlwn-a7ec73386ce2a8ab351ee8ab6a1e5475f72617dc.tar.gz
lwn-a7ec73386ce2a8ab351ee8ab6a1e5475f72617dc.zip
Bluetooth: Fix removing any IRKs when unpairing devices
When mgmt_unpair_device is called we should also remove any associated IRKs. This patch adds a hci_remove_irk convenience function and ensures that it's called when mgmt_unpair_device is called. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index fbb76a0de580..90aac905a98b 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2328,6 +2328,8 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
else
addr_type = ADDR_LE_DEV_RANDOM;
+ hci_remove_irk(hdev, &cp->addr.bdaddr, addr_type);
+
err = hci_remove_ltk(hdev, &cp->addr.bdaddr, addr_type);
}