diff options
| author | Hyunwoo Kim <v4bel@theori.io> | 2023-12-09 05:05:38 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-20 15:32:33 +0100 |
| commit | 02af3c8ab5cda2633b187bd18b5dc2b9f0af0859 (patch) | |
| tree | 7cd84c1a137205701e06e2f61ab4c22be992f1ca | |
| parent | 3ddeb55deec5e0e324d0ab8cc2ddd528518ea12d (diff) | |
| download | linux-stable-02af3c8ab5cda2633b187bd18b5dc2b9f0af0859.tar.gz linux-stable-02af3c8ab5cda2633b187bd18b5dc2b9f0af0859.tar.bz2 linux-stable-02af3c8ab5cda2633b187bd18b5dc2b9f0af0859.zip | |
net/rose: Fix Use-After-Free in rose_ioctl
[ Upstream commit 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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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 ac2ea4ebf7c7..04e5e01002ae 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1309,9 +1309,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); } |