netfilter: nf_tables: reject mismatching sum of field_len with set key length
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/1 netfilter: nf_tables: reject mismatching sum of field_len with set key length
The field length description provides the length of each separated key field in the concatenation, each field gets rounded up to 32-bits to calculate the pipapo rule width from pipapo_init(). The set key length provides the total size of the key aligned to 32-bits.
Register-based arithmetics still allows for combining mismatching set key length and field length description, eg. set key length 10 and field description [ 5, 4 ] leading to pipapo width of 12.
---
v2: reject inconsistent input from nft_set_desc_concat() instead of pipapo_init()
based on Florian's feedback.
net/netfilter/nf_tables_api.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +4 -4
@@ -5065,7 +5065,7 @@ static int nft_set_desc_concat_parse(const struct nlattr *attr,static int nft_set_desc_concat (struct nft_set_desc *desc,const struct nlattr *nla) { -u32 num_regs =0 , key_num_regs =0 ; +u32 len =0 , num_regs;struct nlattr *attr;int rem, err, i;
@@ -5079,12 +5079,12 @@ static int nft_set_desc_concat(struct nft_set_desc *desc, }for (i =0 ; i < desc->field_count; i++) - num_regs +=DIV_ROUND_UP (desc->field_len[i],sizeof (u32)); + len +=round_up (desc->field_len[i],sizeof (u32)); - key_num_regs =DIV_ROUND_UP (desc->klen,sizeof (u32)); -if (key_num_regs != num_regs) +if (len != desc->klen)return -EINVAL ; + num_regs =DIV_ROUND_UP (desc->klen,sizeof (u32));if (num_regs >NFT_REG32_COUNT )return -E2BIG ;
Signature · 1 line
2.30.2
Quoted 8 lines · Pablo Neira Ayuso
The field length description provides the length of each separated key field in the concatenation, each field gets rounded up to 32-bits to calculate the pipapo rule width from
pipapo_init(). The set key length provides the total size of the key aligned to 32-bits.Register-based arithmetics still allows for combining mismatching set key length and field length description, eg. set key length 10 and field description [ 5, 4 ] leading to pipapo width of 12.
Thanks for explaining, makes sense to me.