diff options
| author | Lin Ma <linma@zju.edu.cn> | 2021-05-30 21:37:43 +0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2021-05-31 14:33:26 +0200 |
| commit | e305509e678b3a4af2b3cfd410f409f7cdaabb52 (patch) | |
| tree | 74dfc8160419cf67bc15caebd9617da5f4e2d090 /net/bluetooth/hci_sock.c | |
| parent | 6a137caec23aeb9e036cdfd8a46dd8a366460e5d (diff) | |
| download | linux-e305509e678b3a4af2b3cfd410f409f7cdaabb52.tar.gz linux-e305509e678b3a4af2b3cfd410f409f7cdaabb52.tar.bz2 linux-e305509e678b3a4af2b3cfd410f409f7cdaabb52.zip | |
Bluetooth: use correct lock to prevent UAF of hdev object
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: Lin Ma <linma@zju.edu.cn>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 251b9128f530..eed0dd066e12 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -762,7 +762,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; @@ -771,7 +771,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); } |