Skip to contentSkip to conversation

netfilter: nf_tables: tighten netlink attribute requirements for catch-all elements

PATCH Superseded Pablo Neira Ayuso 1 participant 1 message Apr 18, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 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")
---
 net/netfilter/nf_tables_api.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +4 -1
index 98043e83af71..249f2ebd1f76 100644
@@ -6108,7 +6108,10 @@ 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])
+		return -EINVAL;
+	else if (!nla[NFTA_SET_ELEM_KEY])
 		return -EINVAL;
 
 	if (flags != 0) {
Signature · 1 line
2.30.2