Revert "net/sctp: fix race condition in sctp_destroy_sock"
authorXin Long <lucien.xin@gmail.com>
Sun, 2 May 2021 21:11:41 +0000 (05:11 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2021 20:36:21 +0000 (13:36 -0700)
commit01bfe5e8e428b475982a98a46cca5755726f3f7f
tree493ce8d5208472d790b499e710c44a7704cbe256
parent2e9f60932a2c19e8a11b4a69d419f107024b05a0
Revert "net/sctp: fix race condition in sctp_destroy_sock"

This reverts commit b166a20b07382b8bc1dcee2a448715c9c2c81b5b.

This one has to be reverted as it introduced a dead lock, as
syzbot reported:

       CPU0                    CPU1
       ----                    ----
  lock(&net->sctp.addr_wq_lock);
                               lock(slock-AF_INET6);
                               lock(&net->sctp.addr_wq_lock);
  lock(slock-AF_INET6);

CPU0 is the thread of sctp_addr_wq_timeout_handler(), and CPU1
is that of sctp_close().

The original issue this commit fixed will be fixed in the next
patch.

Reported-by: syzbot+959223586843e69a2674@syzkaller.appspotmail.com
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c