diff options
| author | Hyunwoo Kim <v4bel@theori.io> | 2023-12-09 05:05:38 -0500 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-12-12 13:24:58 +0100 |
| commit | 810c38a369a0a0ce625b5c12169abce1dd9ccd53 (patch) | |
| tree | 244458a236eab79a927e20db2ed3fa88ba89d8a6 /net/rose | |
| parent | 24e90b9e34f9e039f56b5f25f6e6eb92cdd8f4b3 (diff) | |
net/rose: Fix Use-After-Free in rose_ioctl
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 <v4bel@theori.io>
Link: https://lore.kernel.org/r/20231209100538.GA407321@v4bel-B760M-AORUS-ELITE-AX
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 0cc5a4e19900..ecb91ad4ce63 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1315,9 +1315,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); } |