netdev - Re: [PATCH net] net, sk_msg: Don't check if sock is locked when tearing down psock

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20200122.203037.138201907865382075.davem@davemloft.net>
Date:   Wed, 22 Jan 2020 20:30:37 +0100 (CET)
From:   David Miller <davem@...emloft.net>
To:     jakub@...udflare.com
Cc:     netdev@...r.kernel.org, john.fastabend@...il.com,
        syzbot+d73682fcf7fee6982fe3@...kaller.appspotmail.com
Subject: Re: [PATCH net] net, sk_msg: Don't check if sock is locked when
 tearing down psock

From: Jakub Sitnicki <jakub@...udflare.com>
Date: Tue, 21 Jan 2020 13:31:47 +0100

> As John Fastabend reports [0], psock state tear-down can happen on receive
> path *after* unlocking the socket, if the only other psock user, that is
> sockmap or sockhash, releases its psock reference before tcp_bpf_recvmsg
> does so:
> 
>  tcp_bpf_recvmsg()
>   psock = sk_psock_get(sk)                         <- refcnt 2
>   lock_sock(sk);
>   ...
>                                   sock_map_free()  <- refcnt 1
>   release_sock(sk)
>   sk_psock_put()                                   <- refcnt 0
> 
> Remove the lockdep check for socket lock in psock tear-down that got
> introduced in 7e81a3530206 ("bpf: Sockmap, ensure sock lock held during
> tear down").
> 
> [0] https://lore.kernel.org/netdev/5e25dc995d7d_74082aaee6e465b441@john-XPS-13-9370.notmuch/
> 
> Fixes: 7e81a3530206 ("bpf: Sockmap, ensure sock lock held during tear down")
> Reported-by: syzbot+d73682fcf7fee6982fe3@...kaller.appspotmail.com
> Suggested-by: John Fastabend <john.fastabend@...il.com>
> Signed-off-by: Jakub Sitnicki <jakub@...udflare.com>

Applied, thank you.