Skip to content

Commit 5a465a0

Browse files
q2venkuba-moo
authored andcommitted
udp: Fix multiple wraparounds of sk->sk_rmem_alloc.
__udp_enqueue_schedule_skb() has the following condition: if (atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf) goto drop; sk->sk_rcvbuf is initialised by net.core.rmem_default and later can be configured by SO_RCVBUF, which is limited by net.core.rmem_max, or SO_RCVBUFFORCE. If we set INT_MAX to sk->sk_rcvbuf, the condition is always false as sk->sk_rmem_alloc is also signed int. Then, the size of the incoming skb is added to sk->sk_rmem_alloc unconditionally. This results in integer overflow (possibly multiple times) on sk->sk_rmem_alloc and allows a single socket to have skb up to net.core.udp_mem[1]. For example, if we set a large value to udp_mem[1] and INT_MAX to sk->sk_rcvbuf and flood packets to the socket, we can see multiple overflows: # cat /proc/net/sockstat | grep UDP: UDP: inuse 3 mem 7956736 <-- (7956736 << 12) bytes > INT_MAX * 15 ^- PAGE_SHIFT # ss -uam State Recv-Q ... UNCONN -1757018048 ... <-- flipping the sign repeatedly skmem:(r2537949248,rb2147483646,t0,tb212992,f1984,w0,o0,bl0,d0) Previously, we had a boundary check for INT_MAX, which was removed by commit 6a1f12d ("udp: relax atomic operation on sk->sk_rmem_alloc"). A complete fix would be to revert it and cap the right operand by INT_MAX: rmem = atomic_add_return(size, &sk->sk_rmem_alloc); if (rmem > min(size + (unsigned int)sk->sk_rcvbuf, INT_MAX)) goto uncharge_drop; but we do not want to add the expensive atomic_add_return() back just for the corner case. Casting rmem to unsigned int prevents multiple wraparounds, but we still allow a single wraparound. # cat /proc/net/sockstat | grep UDP: UDP: inuse 3 mem 524288 <-- (INT_MAX + 1) >> 12 # ss -uam State Recv-Q ... UNCONN -2147482816 ... <-- INT_MAX + 831 bytes skmem:(r2147484480,rb2147483646,t0,tb212992,f3264,w0,o0,bl0,d14468947) So, let's define rmem and rcvbuf as unsigned int and check skb->truesize only when rcvbuf is large enough to lower the overflow possibility. Note that we still have a small chance to see overflow if multiple skbs to the same socket are processed on different core at the same time and each size does not exceed the limit but the total size does. Note also that we must ignore skb->truesize for a small buffer as explained in commit 363dc73 ("udp: be less conservative with sock rmem accounting"). Fixes: 6a1f12d ("udp: relax atomic operation on sk->sk_rmem_alloc") Signed-off-by: Kuniyuki Iwashima <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1b7fdc7 commit 5a465a0

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

net/ipv4/udp.c

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,17 +1725,25 @@ static int udp_rmem_schedule(struct sock *sk, int size)
17251725
int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
17261726
{
17271727
struct sk_buff_head *list = &sk->sk_receive_queue;
1728-
int rmem, err = -ENOMEM;
1728+
unsigned int rmem, rcvbuf;
17291729
spinlock_t *busy = NULL;
1730-
int size, rcvbuf;
1730+
int size, err = -ENOMEM;
17311731

1732-
/* Immediately drop when the receive queue is full.
1733-
* Always allow at least one packet.
1734-
*/
17351732
rmem = atomic_read(&sk->sk_rmem_alloc);
17361733
rcvbuf = READ_ONCE(sk->sk_rcvbuf);
1737-
if (rmem > rcvbuf)
1738-
goto drop;
1734+
size = skb->truesize;
1735+
1736+
/* Immediately drop when the receive queue is full.
1737+
* Cast to unsigned int performs the boundary check for INT_MAX.
1738+
*/
1739+
if (rmem + size > rcvbuf) {
1740+
if (rcvbuf > INT_MAX >> 1)
1741+
goto drop;
1742+
1743+
/* Always allow at least one packet for small buffer. */
1744+
if (rmem > rcvbuf)
1745+
goto drop;
1746+
}
17391747

17401748
/* Under mem pressure, it might be helpful to help udp_recvmsg()
17411749
* having linear skbs :
@@ -1745,10 +1753,10 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
17451753
*/
17461754
if (rmem > (rcvbuf >> 1)) {
17471755
skb_condense(skb);
1748-
1756+
size = skb->truesize;
17491757
busy = busylock_acquire(sk);
17501758
}
1751-
size = skb->truesize;
1759+
17521760
udp_set_dev_scratch(skb);
17531761

17541762
atomic_add(size, &sk->sk_rmem_alloc);

0 commit comments

Comments
 (0)