summaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2022-08-09 13:39:18 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2022-08-10 17:06:05 +0200
commit4963674c2e71fc062f8f089f0f58ffbb5533060b (patch)
tree041574096a0dbb576c30e71b61b40fc8b615d8e3 /net/netfilter
parent3400278328285a8c2f121904496aff5e7b610a01 (diff)
downloadlinux-stable-4963674c2e71fc062f8f089f0f58ffbb5533060b.tar.gz
linux-stable-4963674c2e71fc062f8f089f0f58ffbb5533060b.tar.bz2
linux-stable-4963674c2e71fc062f8f089f0f58ffbb5533060b.zip
netfilter: nf_tables: disallow NFTA_SET_ELEM_KEY_END with NFT_SET_ELEM_INTERVAL_END flag
These are mutually exclusive, actually NFTA_SET_ELEM_KEY_END replaces the flag notation. Fixes: 7b225d0b5c6d ("netfilter: nf_tables: add NFTA_SET_ELEM_KEY_END attribute") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_tables_api.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 8b084cd669ab..ac549c5b88c2 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5901,6 +5901,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
nla[NFTA_SET_ELEM_EXPIRATION] ||
nla[NFTA_SET_ELEM_USERDATA] ||
nla[NFTA_SET_ELEM_EXPR] ||
+ nla[NFTA_SET_ELEM_KEY_END] ||
nla[NFTA_SET_ELEM_EXPRESSIONS]))
return -EINVAL;