Skip to contentSkip to conversation

appletalk: Fix Use-After-Free in atalk_ioctl

PATCH Superseded Hyunwoo Kim 2 participants 2 messages Dec 6, 2023 – Dec 7, 2023

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 appletalk: Fix Use-After-Free in atalk_ioctl

Because atalk_ioctl() accesses sk->sk_receive_queue without holding a sk->sk_receive_queue.lock, it can cause a race with atalk_recvmsg().
A use-after-free for skb occurs with the following flow.

```
atalk_ioctl() -> skb_peek()
atalk_recvmsg() -> skb_recv_datagram() -> skb_free_datagram()
```

Add sk->sk_receive_queue.lock to atalk_ioctl() to fix this issue.

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
---
 net/appletalk/ddp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/appletalk/ddp.c +3 -2
index 9ba04a69ec2a..f240d5338bc9 100644
@@ -1775,15 +1775,16 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 		break;
 	}
 	case TIOCINQ: {
+		long amount = 0;
 		/*
 		 * These two are safe on a single CPU system as only
 		 * user tasks fiddle here
 		 */
+		spin_lock_irq(&sk->sk_receive_queue.lock);
 		struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
-		long amount = 0;
-
 		if (skb)
 			amount = skb->len - sizeof(struct ddpehdr);
+		spin_unlock_irq(&sk->sk_receive_queue.lock);
 		rc = put_user(amount, (int __user *)argp);
 		break;
 	}
Signature · 1 line
2.25.1
#1 lore raw

From: Hyunwoo Kim <[email protected]>
Date: Wed, 6 Dec 2023 04:09:23 -0800

Quoted 21 lines

Because atalk_ioctl() accesses sk->sk_receive_queue without holding a sk->sk_receive_queue.lock, it can cause a race with atalk_recvmsg().
A use-after-free for skb occurs with the following flow.

```
atalk_ioctl() -> skb_peek()
atalk_recvmsg() -> skb_recv_datagram() -> skb_free_datagram()
```

Add sk->sk_receive_queue.lock to atalk_ioctl() to fix this issue.

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
---
 net/appletalk/ddp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/appletalk/ddp.c +0 -0
index 9ba04a69ec2a..f240d5338bc9 100644

net/appletalk/ddp.c static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · line 1783

Quoted 9 lines
net/appletalk/ddp.c +2 -0
@@ -1775,15 +1775,16 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 		break;
 	}
 	case TIOCINQ: {
+		long amount = 0;
 		/*
 		 * These two are safe on a single CPU system as only
 		 * user tasks fiddle here
 		 */
+		spin_lock_irq(&sk->sk_receive_queue.lock);

nit: please call spin_lock() after declaring all variables; otherwise checkpatch.pl will complain.

net/appletalk/ddp.c static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) · line 1783

Quoted 2 lines
net/appletalk/ddp.c +0 -1
 		struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
-		long amount = 0;

Also, please keep the reverse xmas tree.

Quoted 10 lines
net/appletalk/ddp.c +1 -1
-
 		if (skb)
 			amount = skb->len - sizeof(struct ddpehdr);
+		spin_unlock_irq(&sk->sk_receive_queue.lock);
 		rc = put_user(amount, (int __user *)argp);
 		break;
 	}
Signature · 1 line
2.25.1