Commit 74e69053 authored by Hyunwoo Kim's avatar Hyunwoo Kim Committed by Lu Wei
Browse files

net/rose: Fix Use-After-Free in rose_ioctl 

mainline inclusion
from mainline-v6.7-rc6
commit 810c38a369a0a0ce625b5c12169abce1dd9ccd53
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8RXMW
CVE: CVE-2023-51782

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=810c38a369a0a0ce625b5c12169abce1dd9ccd53



--------------------------------

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: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarHyunwoo Kim <v4bel@theori.io>
Link: https://lore.kernel.org/r/20231209100538.GA407321@v4bel-B760M-AORUS-ELITE-AX


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarLu Wei <luwei32@huawei.com>
parent ee181715

net/rose/af_rose.c

+3 −1
Original line number Diff line number Diff line
@@ -1307,9 +1307,11 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
	case TIOCINQ: {

		struct sk_buff *skb;

		long amount = 0L;

		/* These two are safe on a single CPU system as only user tasks fiddle here */



		spin_lock_irq(&sk->sk_receive_queue.lock);

		if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)

			amount = skb->len;

		spin_unlock_irq(&sk->sk_receive_queue.lock);

		return put_user(amount, (unsigned int __user *) argp);

	}