net/rose: Fix Use-After-Free in rose_ioctl
Subsystems (2)
PATCH 1/1 net/rose: Fix Use-After-Free in rose_ioctl
Because rose_ioctl() accesses sk->sk_receive_queue without holding a lock_sock, 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 lock_sock to rose_ioctl() to fix this issue.
--- 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 */ +lock_sock (sk);if ((skb =skb_peek (&sk->sk_receive_queue)) !=NULL ) amount = skb->len; +release_sock (sk);return put_user (amount, (unsigned int __user *) argp); }
Signature · 1 line
2.25.1
Quoted 21 lines · Hyunwoo Kim
Because
rose_ioctl()accessessk->sk_receive_queuewithout holding alock_sock, it can cause a race withrose_accept().
A use-after-free for skb occurs with the following flow.``` rose_ioctl() -> skb_peek() rose_accept() -> skb_dequeue() -> kfree_skb() ```Add
lock_socktorose_ioctl()to fix this issue.Signed-off-by Hyunwoo Kim <[email protected]>--- 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 1319
Quoted 4 lines
net/rose/af_rose.c +1
-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 */ +lock_sock (sk);
This is not correct.
You will have to lock sk->sk_receive_queue.lock instead.
Look at rose_recvmsg() for the reason why locking the socket itself is not helping.
Quoted 9 lines
net/rose/af_rose.c +1
-1if ((skb =skb_peek (&sk->sk_receive_queue)) !=NULL ) amount = skb->len; +release_sock (sk);return put_user (amount, (unsigned int __user *) argp); } --2.25.1