xsk: add overflow check for u64 division, stored into u32
Subsystems (4)
PATCH 1/1 xsk: add overflow check for u64 division, stored into u32
From: Björn Töpel <[email protected]>
The npgs member of struct xdp_umem is an u32 entity, and stores the number of pages the UMEM consumes. The calculation of npgs
npgs = size / PAGE_SIZE
can overflow.
To avoid overflow scenarios, the division is now first stored in a u64, and the result is verified to fit into 32b.
An alternative would be storing the npgs as a u64, however, this wastes memory and is an unrealisticly large packet area.
--- net/xdp/xdp_umem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/xdp/xdp_umem.c +6 -2
@@ -341,8 +341,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) {bool unaligned_chunks = mr->flags &XDP_UMEM_UNALIGNED_CHUNK_FLAG ;u32 chunk_size = mr->chunk_size, headroom = mr->headroom; +u64 npgs, addr = mr->addr, size = mr->len;unsigned int chunks, chunks_per_page; -u64 addr = mr->addr, size = mr->len;int err;if (chunk_size <XDP_UMEM_MIN_CHUNK_SIZE || chunk_size >PAGE_SIZE ) {
@@ -372,6 +372,10 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)if ((addr + size) < addr)return -EINVAL ; + npgs =div_u64 (size,PAGE_SIZE ); +if (npgs >U32_MAX ) +return -EINVAL ; + chunks = (unsigned int )div_u64 (size, chunk_size);if (chunks ==0 )return -EINVAL ;
@@ -391,7 +395,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) umem->size = size; umem->headroom = headroom; umem->chunk_size_nohr = chunk_size - headroom; - umem->npgs = size /PAGE_SIZE ; + umem->npgs = (u32 )npgs; umem->pgs =NULL ; umem->user =NULL ; umem->flags = mr->flags;
base-commit: d04322a0da1e86aedaa322ce933cfb8c0191d1eb
Signature · 1 line
2.25.1
Quoted 12 lines · Björn Töpel
From: Björn Töpel <[email protected]>
The npgs member of struct
xdp_umemis an u32 entity, and stores the number of pages the UMEM consumes. The calculation of npgsnpgs = size /
PAGE_SIZEcan overflow.
To avoid overflow scenarios, the division is now first stored in a u64, and the result is verified to fit into 32b.
Quoted 7 lines
An alternative would be storing the npgs as a u64, however, this wastes memory and is an unrealisticly large packet area.
Link https://lore.kernel.org/bpf/CACtPs=GGvV-_Yj6rbpzTVnopgi5nhMoCcTkSkYrJHGQHJWFZMQ@mail.gmail.com/ open hereFixes c0c77d8fb787 ("xsk: add user memory registration support sockopt")Reported-by "Minh Bùi Quang" <[email protected]>Signed-off-by Björn Töpel <[email protected]>
Quoted 12 lines · Björn Töpel
From: Björn Töpel <[email protected]>
The npgs member of struct
xdp_umemis an u32 entity, and stores the number of pages the UMEM consumes. The calculation of npgsnpgs = size /
PAGE_SIZEcan overflow.
To avoid overflow scenarios, the division is now first stored in a u64, and the result is verified to fit into 32b.
Quoted 7 lines
An alternative would be storing the npgs as a u64, however, this wastes memory and is an unrealisticly large packet area.
Link https://lore.kernel.org/bpf/CACtPs=GGvV-_Yj6rbpzTVnopgi5nhMoCcTkSkYrJHGQHJWFZMQ@mail.gmail.com/ open hereFixes c0c77d8fb787 ("xsk: add user memory registration support sockopt")Reported-by "Minh Bùi Quang" <[email protected]>Signed-off-by Björn Töpel <[email protected]>
Applied, thanks!