l2tp: prevent lockdep issue in l2tp_tunnel_register()
authorEric Dumazet <edumazet@google.com>
Tue, 17 Jan 2023 11:01:31 +0000 (11:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jan 2023 14:44:54 +0000 (14:44 +0000)
commitb9fb10d131b8c84af9bb14e2078d5c63600c7dea
treedec2bca723eb44ac91387d8870c22679a59ad06a
parentd71ebe8114b4bf622804b810f5e274069060a174
l2tp: prevent lockdep issue in l2tp_tunnel_register()

lockdep complains with the following lock/unlock sequence:

     lock_sock(sk);
     write_lock_bh(&sk->sk_callback_lock);
[1]  release_sock(sk);
[2]  write_unlock_bh(&sk->sk_callback_lock);

We need to swap [1] and [2] to fix this issue.

Fixes: 0b2c59720e65 ("l2tp: close all race conditions in l2tp_tunnel_register()")
Reported-by: syzbot+bbd35b345c7cab0d9a08@syzkaller.appspotmail.com
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/netdev/20230114030137.672706-1-xiyou.wangcong@gmail.com/T/#m1164ff20628671b0f326a24cb106ab3239c70ce3
Cc: Cong Wang <cong.wang@bytedance.com>
Cc: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_core.c