Skip to content

Commit 3df8126

Browse files
ImV4belgregkh
authored andcommitted
net/rose: Fix Use-After-Free in rose_ioctl
[ Upstream commit 810c38a ] Because rose_ioctl() accesses sk->sk_receive_queue without holding a sk->sk_receive_queue.lock, it can cause a race with rose_accept(). A use-after-free for skb occurs with the following flow. ``` rose_ioctl() -> skb_peek() rose_accept() -> skb_dequeue() -> kfree_skb() ``` Add sk->sk_receive_queue.lock to rose_ioctl() to fix this issue. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Hyunwoo Kim <[email protected]> Link: https://lore.kernel.org/r/20231209100538.GA407321@v4bel-B760M-AORUS-ELITE-AX Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b099c28 commit 3df8126

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/rose/af_rose.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,9 +1285,11 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
12851285
case TIOCINQ: {
12861286
struct sk_buff *skb;
12871287
long amount = 0L;
1288-
/* These two are safe on a single CPU system as only user tasks fiddle here */
1288+
1289+
spin_lock_irq(&sk->sk_receive_queue.lock);
12891290
if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
12901291
amount = skb->len;
1292+
spin_unlock_irq(&sk->sk_receive_queue.lock);
12911293
return put_user(amount, (unsigned int __user *) argp);
12921294
}
12931295

0 commit comments

Comments
 (0)