net/rose: Fix Use-After-Free in rose_ioctl
Subsystems (2)
PATCH v3 1/1 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 <[email protected]>
---
v1 -> v2: Use sk->sk_receive_queue.lock instead of lock_sock. v2 -> v3: Change spin_lock to spin_lock_irq
--- net/rose/af_rose.c | 2 ++ 1 file changed, 2 insertions(+)
net/rose/af_rose.c +2 -0
@@ -1316,8 +1316,10 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)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); }
Signature · 1 line
2.25.1
Quoted 11 lines · Hyunwoo Kim
--- net/rose/af_rose.c | 2 ++ 1 file changed, 2 insertions(+)net/rose/af_rose.c +0
-0
net/rose/af_rose.c static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · line 1318
Quoted 3 lines
net/rose/af_rose.c +0
-0@@ -1316,8 +1316,10 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)struct sk_buff *skb;long amount =0L ;/* These two are safe on a single CPU system as only user tasks fiddle here */
Can you remove this stale and confused comment ?
Thanks.