mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 15:29:16 +00:00
Phonet: listening socket lock protects the connected socket list
The accept()'d socket need to be unhashed while the (listen()'ing) socket lock is held. This fixes a race condition that could lead to an OOPS. Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
97dc875f90
commit
7dfde179c3
@ -1045,12 +1045,12 @@ static void pep_sock_unhash(struct sock *sk)
|
||||
lock_sock(sk);
|
||||
if ((1 << sk->sk_state) & ~(TCPF_CLOSE|TCPF_LISTEN)) {
|
||||
skparent = pn->listener;
|
||||
sk_del_node_init(sk);
|
||||
release_sock(sk);
|
||||
|
||||
sk = skparent;
|
||||
pn = pep_sk(skparent);
|
||||
lock_sock(sk);
|
||||
lock_sock(skparent);
|
||||
sk_del_node_init(sk);
|
||||
sk = skparent;
|
||||
}
|
||||
/* Unhash a listening sock only when it is closed
|
||||
* and all of its active connected pipes are closed. */
|
||||
|
Loading…
x
Reference in New Issue
Block a user