netfilter: nft_set_pipapo: prevent overflow in allocations
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nft_set_pipapo: prevent overflow in allocations
When calculating the lookup table size, ensure the following multiplication does not overflow:
- desc->field_len[] maximum value is U8_MAX multiplied by NFT_PIPAPO_GROUPS_PER_BYTE(f) that can be 2, worst case.
- NFT_PIPAPO_BUCKETS(f->bb) is 2^8, worst case.
- sizeof(unsigned long), from sizeof(*f->lt), lt in struct nft_pipapo_field.
Then, use check_mul_overflow() to multiply by bucket size and then use check_add_overflow() to the alignment for avx2 (if needed). Finally, add lt_size_check_overflow() helper and use it to consolidate this.
Check for overflows when calculating the size of the map bucket too in struct nft_pipapo_field.
While at it, replace leftover allocation using the GFP_KERNEL to GFP_KERNEL_ACCOUNT for consistency, in pipapo_resize().
---
I can route this through nf.git if preferred.
net/netfilter/nft_set_pipapo.c | 54 ++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 13 deletions(-)
net/netfilter/nft_set_pipapo.c +41 -13
@@ -663,6 +663,9 @@ static int pipapo_realloc_mt(struct nft_pipapo_field *f, check_add_overflow(rules, extra, &rules_alloc))return -EOVERFLOW ; +if (rules_alloc > (INT_MAX /sizeof (*new_mt))) +return -ENOMEM ; + new_mt =kvmalloc_array (rules_alloc,sizeof (*new_mt),GFP_KERNEL_ACCOUNT );if (!new_mt)return -ENOMEM ;
@@ -683,6 +686,22 @@ static int pipapo_realloc_mt(struct nft_pipapo_field *f,return 0 ; } +static bool lt_size_check_overflow (unsigned int groups,unsigned int bb, +unsigned int bsize,size_t size, +size_t *lt_size) +{ + *lt_size = groups *NFT_PIPAPO_BUCKETS (bb) * size; + +if (check_mul_overflow (*lt_size, bsize, lt_size)) +return true; +if (check_add_overflow (*lt_size,NFT_PIPAPO_ALIGN_HEADROOM , lt_size)) +return true; +if (*lt_size >INT_MAX ) +return true; + +return false; +} +/** * pipapo_resize() - Resize lookup or mapping table, or both * @f: Field containing lookup and mapping tables
@@ -701,6 +720,7 @@ static int pipapo_resize(struct nft_pipapo_field *f,long *new_lt =NULL , *new_p, *old_lt = f->lt, *old_p;unsigned int new_bucket_size, copy;int group, bucket, err; +size_t lt_size;if (rules >=NFT_PIPAPO_RULE0_MAX )return -ENOSPC ;
@@ -719,10 +739,11 @@ static int pipapo_resize(struct nft_pipapo_field *f,else copy = new_bucket_size; - new_lt =kvzalloc (f->groups *NFT_PIPAPO_BUCKETS (f->bb) * - new_bucket_size *sizeof (*new_lt) + -NFT_PIPAPO_ALIGN_HEADROOM , -GFP_KERNEL ); +if (lt_size_check_overflow (f->groups, f->bb, new_bucket_size, +sizeof (*new_lt), <_size)) +return -ENOMEM ; + + new_lt =kvzalloc (lt_size,GFP_KERNEL_ACCOUNT );if (!new_lt)return -ENOMEM ;
@@ -917,15 +938,17 @@ static void pipapo_lt_bits_adjust(struct nft_pipapo_field *f) groups = f->groups *2 ; bb =NFT_PIPAPO_GROUP_BITS_LARGE_SET ; - lt_size = groups *NFT_PIPAPO_BUCKETS (bb) * f->bsize * -sizeof (*f->lt); +if (lt_size_check_overflow (groups, bb, f->bsize, +sizeof (*f->lt), <_size)) +return ; }else if (f->bb ==NFT_PIPAPO_GROUP_BITS_LARGE_SET && lt_size <NFT_PIPAPO_LT_SIZE_LOW ) { groups = f->groups /2 ; bb =NFT_PIPAPO_GROUP_BITS_SMALL_SET ; - lt_size = groups *NFT_PIPAPO_BUCKETS (bb) * f->bsize * -sizeof (*f->lt); +if (lt_size_check_overflow (groups, bb, f->bsize, +sizeof (*f->lt), <_size)) +return ;/* Don't increase group width if the resulting lookup table size * would exceed the upper size threshold for a "small" set.
@@ -936,7 +959,7 @@ static void pipapo_lt_bits_adjust(struct nft_pipapo_field *f)return ; } - new_lt =kvzalloc (lt_size +NFT_PIPAPO_ALIGN_HEADROOM ,GFP_KERNEL_ACCOUNT ); + new_lt =kvzalloc (lt_size,GFP_KERNEL_ACCOUNT );if (!new_lt)return ;
@@ -1451,13 +1474,15 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old)for (i =0 ; i < old->field_count; i++) {unsigned long *new_lt; +size_t lt_size;memcpy (dst, src, offsetof(struct nft_pipapo_field , lt)); - new_lt =kvzalloc (src->groups *NFT_PIPAPO_BUCKETS (src->bb) * - src->bsize *sizeof (*dst->lt) + -NFT_PIPAPO_ALIGN_HEADROOM , -GFP_KERNEL_ACCOUNT ); +if (lt_size_check_overflow (src->groups, src->bb, src->bsize, +sizeof (*dst->lt), <_size)) + goto out_lt; + + new_lt =kvzalloc (lt_size,GFP_KERNEL_ACCOUNT );if (!new_lt) goto out_lt;
@@ -1469,6 +1494,9 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) src->groups * NFT_PIPAPO_BUCKETS(src->bb));if (src->rules >0 ) { +if (src->rules_alloc > (INT_MAX /sizeof (*src->mt))) + goto out_mt; + dst->mt =kvmalloc_array (src->rules_alloc,sizeof (*src->mt),GFP_KERNEL_ACCOUNT );
Signature · 1 line
2.30.2