diff options
| author | Myungho Jung | 2019-02-03 01:56:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-03-27 06:14:42 +0100 |
| commit | 4b39051363a0a374afd073e2fcaaa8602b1befa2 (patch) | |
| tree | 174c50278f682c519f6489728ea4c09587de619a /net | |
| parent | Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf() (diff) | |
| download | kernel-qcow2-linux-4b39051363a0a374afd073e2fcaaa8602b1befa2.tar.gz kernel-qcow2-linux-4b39051363a0a374afd073e2fcaaa8602b1befa2.tar.xz kernel-qcow2-linux-4b39051363a0a374afd073e2fcaaa8602b1befa2.zip | |
Bluetooth: Fix decrementing reference count twice in releasing socket
commit e20a2e9c42c9e4002d9e338d74e7819e88d77162 upstream.
When releasing socket, it is possible to enter hci_sock_release() and
hci_sock_dev_event(HCI_DEV_UNREG) at the same time in different thread.
The reference count of hdev should be decremented only once from one of
them but if storing hdev to local variable in hci_sock_release() before
detached from socket and setting to NULL in hci_sock_dev_event(),
hci_dev_put(hdev) is unexpectedly called twice. This is resolved by
referencing hdev from socket after bt_sock_unlink() in
hci_sock_release().
Reported-by: syzbot+fdc00003f4efff43bc5b@syzkaller.appspotmail.com
Signed-off-by: Myungho Jung <mhjungk@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 1506e1632394..d4e2a166ae17 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -831,8 +831,6 @@ static int hci_sock_release(struct socket *sock) if (!sk) return 0; - hdev = hci_pi(sk)->hdev; - switch (hci_pi(sk)->channel) { case HCI_CHANNEL_MONITOR: atomic_dec(&monitor_promisc); @@ -854,6 +852,7 @@ static int hci_sock_release(struct socket *sock) bt_sock_unlink(&hci_sk_list, sk); + hdev = hci_pi(sk)->hdev; if (hdev) { if (hci_pi(sk)->channel == HCI_CHANNEL_USER) { /* When releasing a user channel exclusive access, |