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

Commit 3c62132d authored by Lin Ma's avatar Lin Ma Committed by Greg Kroah-Hartman
Browse files

Bluetooth: use correct lock to prevent UAF of hdev object 



commit e305509e678b3a4af2b3cfd410f409f7cdaabb52 upstream.

The hci_sock_dev_event() function will cleanup the hdev object for
sockets even if this object may still be in used within the
hci_sock_bound_ioctl() function, result in UAF vulnerability.

This patch replace the BH context lock to serialize these affairs
and prevent the race condition.

Signed-off-by: default avatarLin Ma <linma@zju.edu.cn>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75aa7baa

net/bluetooth/hci_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event) 
		/* Detach sockets from device */

		read_lock(&hci_sk_list.lock);

		sk_for_each(sk, &hci_sk_list.head) {

			bh_lock_sock_nested(sk);

			lock_sock(sk);

			if (hci_pi(sk)->hdev == hdev) {

				hci_pi(sk)->hdev = NULL;

				sk->sk_err = EPIPE;
@@ -759,7 +759,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event) 


				hci_dev_put(hdev);

			}

			bh_unlock_sock(sk);

			release_sock(sk);

		}

		read_unlock(&hci_sk_list.lock);

	}