diff mbox series

[nf,2/2] netfilter: nf_tables: reject constant set with timeout

Message ID 20240301004609.10237-2-pablo@netfilter.org
State Changes Requested
Headers show
Series [nf,1/2] netfilter: nf_tables: disallow anonymous set with NFT_SET_{TIMEOUT,EVAL} flags | expand

Commit Message

Pablo Neira Ayuso March 1, 2024, 12:46 a.m. UTC 
This set combination is weird: it allows for elements to be
added/deleted, but once bound to the rule it cannot be updated anymore.
Eventually, all elements expire, leading to an empty set which cannot
be updated anymore. Reject this flags combination.

Fixes: 761da2935d6e ("netfilter: nf_tables: add set timeout API support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_tables_api.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 70f90e7d108c..9e04fbb2065d 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5004,6 +5004,9 @@  static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,
 		if ((flags & NFT_SET_ANONYMOUS) &&
 		    (flags & (NFT_SET_TIMEOUT | NFT_SET_EVAL)))
 			return -EOPNOTSUPP;
+		if ((flags & (NFT_SET_CONSTANT | NFT_SET_TIMEOUT)) ==
+			     (NFT_SET_CONSTANT | NFT_SET_TIMEOUT))
+			return -EOPNOTSUPP;
 	}
 
 	desc.dtype = 0;