]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xsk: fix an integer overflow in xp_create_and_assign_umem()
authorGavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
Thu, 13 Mar 2025 08:50:08 +0000 (08:50 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Mar 2025 21:03:31 +0000 (22:03 +0100)
commit 559847f56769037e5b2e0474d3dbff985b98083d upstream.

Since the i and pool->chunk_size variables are of type 'u32',
their product can wrap around and then be cast to 'u64'.
This can lead to two different XDP buffers pointing to the same
memory area.

Found by InfoTeCS on behalf of Linux Verification Center
(linuxtesting.org) with SVACE.

Fixes: 94033cd8e73b ("xsk: Optimize for aligned case")
Cc: stable@vger.kernel.org
Signed-off-by: Ilia Gavrilov <Ilia.Gavrilov@infotecs.ru>
Link: https://patch.msgid.link/20250313085007.3116044-1-Ilia.Gavrilov@infotecs.ru
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/xdp/xsk_buff_pool.c

index 0662d34b09ee782a792a4b43407c99dae61dfff0..87e865b9b83af972e2436f16b58758f30c4f3e1d 100644 (file)
@@ -106,7 +106,7 @@ struct xsk_buff_pool *xp_create_and_assign_umem(struct xdp_sock *xs,
                if (pool->unaligned)
                        pool->free_heads[i] = xskb;
                else
-                       xp_init_xskb_addr(xskb, pool, i * pool->chunk_size);
+                       xp_init_xskb_addr(xskb, pool, (u64)i * pool->chunk_size);
        }
 
        return pool;