Skip to contentSkip to conversation

phonet: take correct lock to peek at the RX queue

PATCH Applied Rémi Denis-Courmont 2 participants 2 messages Feb 18, 2024 – Feb 22, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 phonet: take correct lock to peek at the RX queue

From: Rémi Denis-Courmont <[email protected]>

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")
---
 net/phonet/datagram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/phonet/datagram.c +2 -2
index 3aa50dc7535b..976fe250b509 100644
@@ -34,10 +34,10 @@ static int pn_ioctl(struct sock *sk, int cmd, int *karg)
 
 	switch (cmd) {
 	case SIOCINQ:
-		lock_sock(sk);
+		spin_lock_bh(&sk->sk_receive_queue.lock);
 		skb = skb_peek(&sk->sk_receive_queue);
 		*karg = skb ? skb->len : 0;
-		release_sock(sk);
+		spin_unlock_bh(&sk->sk_receive_queue.lock);
 		return 0;
 
 	case SIOCPNADDRESOURCE:
Signature · 1 line
2.43.0
#1 lore raw
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:

Hello:

This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

Quoted 11 lines · On Sun, 18 Feb 2024 10:12:13 +0200 you wrote:

From: Rémi Denis-Courmont <[email protected]>

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")

[...]

Here is the summary with links:
- [PATCHv2,1/2] phonet: take correct lock to peek at the RX queue

    https://git.kernel.org/netdev/net/c/3b2d9bc4d4ac
  - [PATCHv2,2/2] phonet/pep: fix racy skb_queue_empty() use
    https://git.kernel.org/netdev/net/c/7d2a894d7f48

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html