Skip to content

Commit 9ea4b47

Browse files
Gavrilov Iliaummakynes
authored andcommitted
netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function.
When first_ip is 0, last_ip is 0xFFFFFFFF, and netmask is 31, the value of an arithmetic expression 2 << (netmask - mask_bits - 1) is subject to overflow due to a failure casting operands to a larger data type before performing the arithmetic. Note that it's harmless since the value will be checked at the next step. Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE. Fixes: b9fed74 ("netfilter: ipset: Check and reject crazy /0 input parameters") Signed-off-by: Ilia.Gavrilov <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent c273289 commit 9ea4b47

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/netfilter/ipset/ip_set_bitmap_ip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ bitmap_ip_create(struct net *net, struct ip_set *set, struct nlattr *tb[],
308308
return -IPSET_ERR_BITMAP_RANGE;
309309

310310
pr_debug("mask_bits %u, netmask %u\n", mask_bits, netmask);
311-
hosts = 2 << (32 - netmask - 1);
312-
elements = 2 << (netmask - mask_bits - 1);
311+
hosts = 2U << (32 - netmask - 1);
312+
elements = 2UL << (netmask - mask_bits - 1);
313313
}
314314
if (elements > IPSET_BITMAP_MAX_RANGE + 1)
315315
return -IPSET_ERR_BITMAP_RANGE_SIZE;

0 commit comments

Comments
 (0)