1 files changed, 10 insertions, 3 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f1a51564b8fd..7913c28c643d 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -307,7 +307,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,
         long timeo;
         int err = 0;
 
-        lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+        lock_sock_nested(sk, L2CAP_NESTING_PARENT);
 
         timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
 
@@ -339,7 +339,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,
 
                 release_sock(sk);
                 timeo = schedule_timeout(timeo);
-                lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+                lock_sock_nested(sk, L2CAP_NESTING_PARENT);
         }
         __set_current_state(TASK_RUNNING);
         remove_wait_queue(sk_sleep(sk), &wait);
@@ -1252,7 +1252,14 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)
         struct sock *sk = chan->data;
         struct sock *parent;
 
-        lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+        /* This callback can be called both for server (BT_LISTEN)
+         * sockets as well as "normal" ones. To avoid lockdep warnings
+         * with child socket locking (through l2cap_sock_cleanup_listen)
+         * we need separation into separate nesting levels. The simplest
+         * way to accomplish this is to inherit the nesting level used
+         * for the channel.
+         */
+        lock_sock_nested(sk, atomic_read(&chan->nesting));
 
         parent = bt_sk(sk)->parent;