netfilter: nf_tables: tighten netlink attribute requirements for catch-all elements
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/1 netfilter: nf_tables: tighten netlink attribute requirements for catch-all elements
If NFT_SET_ELEM_CATCHALL is set on, then userspace provides no set element key. Otherwise, bail out with -EINVAL.
Fixes aaa31047a6d2 ("netfilter: nftables: add catch-all set element support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: fix incorrect logic.
net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -6108,7 +6108,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,if (err <0 )return err; -if (!nla[NFTA_SET_ELEM_KEY ] && !(flags &NFT_SET_ELEM_CATCHALL )) +if (((flags &NFT_SET_ELEM_CATCHALL ) && nla[NFTA_SET_ELEM_KEY ]) || + (!(flags &NFT_SET_ELEM_CATCHALL ) && !nla[NFTA_SET_ELEM_KEY ]))return -EINVAL ;if (flags !=0 ) {
Signature · 1 line
2.30.2