Skip to content

Commit f439d32

Browse files
committed
udp: Fix memory accounting leak.
jira VULN-65244 cve CVE-2025-22058 commit-author Kuniyuki Iwashima <[email protected]> commit df207de Matt Dowling reported a weird UDP memory usage issue. Under normal operation, the UDP memory usage reported in /proc/net/sockstat remains close to zero. However, it occasionally spiked to 524,288 pages and never dropped. Moreover, the value doubled when the application was terminated. Finally, it caused intermittent packet drops. We can reproduce the issue with the script below [0]: 1. /proc/net/sockstat reports 0 pages # cat /proc/net/sockstat | grep UDP: UDP: inuse 1 mem 0 2. Run the script till the report reaches 524,288 # python3 test.py & sleep 5 # cat /proc/net/sockstat | grep UDP: UDP: inuse 3 mem 524288 <-- (INT_MAX + 1) >> PAGE_SHIFT 3. Kill the socket and confirm the number never drops # pkill python3 && sleep 5 # cat /proc/net/sockstat | grep UDP: UDP: inuse 1 mem 524288 4. (necessary since v6.0) Trigger proto_memory_pcpu_drain() # python3 test.py & sleep 1 && pkill python3 5. The number doubles # cat /proc/net/sockstat | grep UDP: UDP: inuse 1 mem 1048577 The application set INT_MAX to SO_RCVBUF, which triggered an integer overflow in udp_rmem_release(). When a socket is close()d, udp_destruct_common() purges its receive queue and sums up skb->truesize in the queue. This total is calculated and stored in a local unsigned integer variable. The total size is then passed to udp_rmem_release() to adjust memory accounting. However, because the function takes a signed integer argument, the total size can wrap around, causing an overflow. Then, the released amount is calculated as follows: 1) Add size to sk->sk_forward_alloc. 2) Round down sk->sk_forward_alloc to the nearest lower multiple of PAGE_SIZE and assign it to amount. 3) Subtract amount from sk->sk_forward_alloc. 4) Pass amount >> PAGE_SHIFT to __sk_mem_reduce_allocated(). When the issue occurred, the total in udp_destruct_common() was 2147484480 (INT_MAX + 833), which was cast to -2147482816 in udp_rmem_release(). At 1) sk->sk_forward_alloc is changed from 3264 to -2147479552, and 2) sets -2147479552 to amount. 3) reverts the wraparound, so we don't see a warning in inet_sock_destruct(). However, udp_memory_allocated ends up doubling at 4). Since commit 3cd3399 ("net: implement per-cpu reserves for memory_allocated"), memory usage no longer doubles immediately after a socket is close()d because __sk_mem_reduce_allocated() caches the amount in udp_memory_per_cpu_fw_alloc. However, the next time a UDP socket receives a packet, the subtraction takes effect, causing UDP memory usage to double. This issue makes further memory allocation fail once the socket's sk->sk_rmem_alloc exceeds net.ipv4.udp_rmem_min, resulting in packet drops. To prevent this issue, let's use unsigned int for the calculation and call sk_forward_alloc_add() only once for the small delta. Note that first_packet_length() also potentially has the same problem. [0]: from socket import * SO_RCVBUFFORCE = 33 INT_MAX = (2 ** 31) - 1 s = socket(AF_INET, SOCK_DGRAM) s.bind(('', 0)) s.setsockopt(SOL_SOCKET, SO_RCVBUFFORCE, INT_MAX) c = socket(AF_INET, SOCK_DGRAM) c.connect(s.getsockname()) data = b'a' * 100 while True: c.send(data) Fixes: f970bd9 ("udp: implement memory accounting helpers") Reported-by: Matt Dowling <[email protected]> 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]> (cherry picked from commit df207de) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent b9fb66a commit f439d32

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

net/ipv4/udp.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,12 +1436,12 @@ static bool udp_skb_has_head_state(struct sk_buff *skb)
14361436
}
14371437

14381438
/* fully reclaim rmem/fwd memory allocated for skb */
1439-
static void udp_rmem_release(struct sock *sk, int size, int partial,
1440-
bool rx_queue_lock_held)
1439+
static void udp_rmem_release(struct sock *sk, unsigned int size,
1440+
int partial, bool rx_queue_lock_held)
14411441
{
14421442
struct udp_sock *up = udp_sk(sk);
14431443
struct sk_buff_head *sk_queue;
1444-
int amt;
1444+
unsigned int amt;
14451445

14461446
if (likely(partial)) {
14471447
up->forward_deficit += size;
@@ -1461,10 +1461,8 @@ static void udp_rmem_release(struct sock *sk, int size, int partial,
14611461
if (!rx_queue_lock_held)
14621462
spin_lock(&sk_queue->lock);
14631463

1464-
1465-
sk_forward_alloc_add(sk, size);
1466-
amt = (sk->sk_forward_alloc - partial) & ~(PAGE_SIZE - 1);
1467-
sk_forward_alloc_add(sk, -amt);
1464+
amt = (size + sk->sk_forward_alloc - partial) & ~(PAGE_SIZE - 1);
1465+
sk_forward_alloc_add(sk, size - amt);
14681466

14691467
if (amt)
14701468
__sk_mem_reduce_allocated(sk, amt >> PAGE_SHIFT);
@@ -1648,7 +1646,7 @@ EXPORT_SYMBOL_GPL(skb_consume_udp);
16481646

16491647
static struct sk_buff *__first_packet_length(struct sock *sk,
16501648
struct sk_buff_head *rcvq,
1651-
int *total)
1649+
unsigned int *total)
16521650
{
16531651
struct sk_buff *skb;
16541652

@@ -1681,8 +1679,8 @@ static int first_packet_length(struct sock *sk)
16811679
{
16821680
struct sk_buff_head *rcvq = &udp_sk(sk)->reader_queue;
16831681
struct sk_buff_head *sk_queue = &sk->sk_receive_queue;
1682+
unsigned int total = 0;
16841683
struct sk_buff *skb;
1685-
int total = 0;
16861684
int res;
16871685

16881686
spin_lock_bh(&rcvq->lock);

0 commit comments

Comments
 (0)