Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c900deb1 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Greg Kroah-Hartman
Browse files

Bluetooth: Fix use-after-free in hci_remove_ltk/hci_remove_irk 



commit c5d2b6fa26b5b8386a9cc902cdece3a46bef2bd2 upstream.

Similar to commit 0f7d9b31ce7a ("netfilter: nf_tables: fix use-after-free
in nft_set_catchall_destroy()"). We can not access k after kfree_rcu()
call.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMin Li <lm0963hack@gmail.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf7bb109

net/bluetooth/hci_core.c

+4 −4
Original line number Diff line number Diff line
@@ -2517,10 +2517,10 @@ int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr) 


int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type)

{

	struct smp_ltk *k;

	struct smp_ltk *k, *tmp;

	int removed = 0;



	list_for_each_entry_rcu(k, &hdev->long_term_keys, list) {

	list_for_each_entry_safe(k, tmp, &hdev->long_term_keys, list) {

		if (bacmp(bdaddr, &k->bdaddr) || k->bdaddr_type != bdaddr_type)

			continue;
@@ -2536,9 +2536,9 @@ int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type) 


void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type)

{

	struct smp_irk *k;

	struct smp_irk *k, *tmp;



	list_for_each_entry_rcu(k, &hdev->identity_resolving_keys, list) {

	list_for_each_entry_safe(k, tmp, &hdev->identity_resolving_keys, list) {

		if (bacmp(bdaddr, &k->bdaddr) || k->addr_type != addr_type)

			continue;