Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phonet: take correct lock to peek at the RX queue

The receive queue is protected by its embedded spin-lock, not the
socket lock, so we need the former lock here (and only that one).

Fixes: 107d0d9b8d9a ("Phonet: Phonet datagram transport protocol")
Reported-by: Luosili <rootlab@huawei.com>
Signed-off-by: Rémi Denis-Courmont <courmisch@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240218081214.4806-1-remi@remlab.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Rémi Denis-Courmont and committed by
Paolo Abeni
3b2d9bc4 603ead96

+2 -2
+2 -2
net/phonet/datagram.c
··· 34 34 35 35 switch (cmd) { 36 36 case SIOCINQ: 37 - lock_sock(sk); 37 + spin_lock_bh(&sk->sk_receive_queue.lock); 38 38 skb = skb_peek(&sk->sk_receive_queue); 39 39 *karg = skb ? skb->len : 0; 40 - release_sock(sk); 40 + spin_unlock_bh(&sk->sk_receive_queue.lock); 41 41 return 0; 42 42 43 43 case SIOCPNADDRESOURCE: