[BLUETOOTH]: Fix locking in hci_sock_dev_event().

We presently use lock_sock() to acquire a lock on a socket in
hci_sock_dev_event(), but this goes BUG because lock_sock()
can sleep and we're already holding a read-write spinlock at
that point. So, we must use the non-sleeping BH version,
bh_lock_sock().

However, hci_sock_dev_event() is called from user context and
hence using simply bh_lock_sock() will deadlock against a
concurrent softirq that tries to acquire a lock on the same
socket. Hence, disabling BH's before acquiring the socket lock
and enable them afterwards, is the proper solution to fix
socket locking in hci_sock_dev_event().

Signed-off-by: Satyam Sharma <ssatyam@cse.iitk.ac.in>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Satyam Sharma and committed by David S. Miller 4ce61d1c 689d7946

+4 -2
+4 -2
net/bluetooth/hci_sock.c
··· 665 /* Detach sockets from device */ 666 read_lock(&hci_sk_list.lock); 667 sk_for_each(sk, node, &hci_sk_list.head) { 668 - lock_sock(sk); 669 if (hci_pi(sk)->hdev == hdev) { 670 hci_pi(sk)->hdev = NULL; 671 sk->sk_err = EPIPE; ··· 675 676 hci_dev_put(hdev); 677 } 678 - release_sock(sk); 679 } 680 read_unlock(&hci_sk_list.lock); 681 }
··· 665 /* Detach sockets from device */ 666 read_lock(&hci_sk_list.lock); 667 sk_for_each(sk, node, &hci_sk_list.head) { 668 + local_bh_disable(); 669 + bh_lock_sock_nested(sk); 670 if (hci_pi(sk)->hdev == hdev) { 671 hci_pi(sk)->hdev = NULL; 672 sk->sk_err = EPIPE; ··· 674 675 hci_dev_put(hdev); 676 } 677 + bh_unlock_sock(sk); 678 + local_bh_enable(); 679 } 680 read_unlock(&hci_sk_list.lock); 681 }