Skip to content

Commit a1de957

Browse files
V4bel-theoriNipaLocal
authored andcommitted
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]> Signed-off-by: NipaLocal <nipa@local>
1 parent 73f8c43 commit a1de957

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
@@ -1315,9 +1315,11 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
13151315
case TIOCINQ: {
13161316
struct sk_buff *skb;
13171317
long amount = 0L;
1318-
/* These two are safe on a single CPU system as only user tasks fiddle here */
1318+
1319+
spin_lock_irq(&sk->sk_receive_queue.lock);
13191320
if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
13201321
amount = skb->len;
1322+
spin_unlock_irq(&sk->sk_receive_queue.lock);
13211323
return put_user(amount, (unsigned int __user *) argp);
13221324
}
13231325

0 commit comments

Comments
 (0)