qrtr: orphan socket in qrtr_release()
authorCong Wang <xiyou.wangcong@gmail.com>
Fri, 24 Jul 2020 16:45:51 +0000 (09:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 25 Jul 2020 00:29:52 +0000 (17:29 -0700)
We have to detach sock from socket in qrtr_release(),
otherwise skb->sk may still reference to this socket
when the skb is released in tun->queue, particularly
sk->sk_wq still points to &sock->wq, which leads to
a UAF.

Reported-and-tested-by: syzbot+6720d64f31c081c2f708@syzkaller.appspotmail.com
Fixes: 28fb4e59a47d ("net: qrtr: Expose tunneling endpoint to user space")
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/qrtr/qrtr.c

index 24a8c3c..300a104 100644 (file)
@@ -1180,6 +1180,7 @@ static int qrtr_release(struct socket *sock)
                sk->sk_state_change(sk);
 
        sock_set_flag(sk, SOCK_DEAD);
+       sock_orphan(sk);
        sock->sk = NULL;
 
        if (!sock_flag(sk, SOCK_ZAPPED))