ipv4/icmp: fix rt dst dev null pointer dereference

[platform/kernel/linux-rpi.git] / net / bluetooth / af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index deacc52..8d12198 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -154,15 +154,25 @@ void bt_sock_unlink(struct bt_sock_list *l, struct sock *sk)
 }
 EXPORT_SYMBOL(bt_sock_unlink);
 
-void bt_accept_enqueue(struct sock *parent, struct sock *sk)
+void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh)
 {
        BT_DBG("parent %p, sk %p", parent, sk);
 
        sock_hold(sk);
-       lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+
+       if (bh)
+               bh_lock_sock_nested(sk);
+       else
+               lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+
        list_add_tail(&bt_sk(sk)->accept_q, &bt_sk(parent)->accept_q);
        bt_sk(sk)->parent = parent;
-       release_sock(sk);
+
+       if (bh)
+               bh_unlock_sock(sk);
+       else
+               release_sock(sk);
+
        parent->sk_ack_backlog++;
 }
 EXPORT_SYMBOL(bt_accept_enqueue);