netfilter: nft_dynset: allow to invert match criteria
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nft_dynset: allow to invert match criteria
The dynset expression matches if we can fit a new entry into the set. If there is not room for it, then it breaks the rule evaluation.
This patch introduces the inversion flag to obtain the opposite behaviour, ie. explicity drop packets that don't fit into set.
For example:
# nft filter input set update ip saddr timeout 10s over size 24 @myset drop
This allows us to express the logic in a similar fashion to iptables connlimit. Basically, every new entry uses the IPv4 address as key in the set, this entry gets a timeout of 10 seconds that gets refresh on every packet seen. If we get a packet and our set contains 24 entries already, then this packet is dropped.
You can also express this in positive logic, assuming default policy to drop:
# nft filter input set update ip saddr timeout 10s size 24 @myset accept
Specifically, the plan is that 'over size' enables this flag inversion.
--- include/uapi/linux/netfilter/nf_tables.h | 6 ++++++ net/netfilter/nft_dynset.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-)
include/uapi/linux/netfilter/nf_tables.h +6 -0
@@ -575,6 +575,10 @@ enum nft_dynset_ops { NFT_DYNSET_OP_UPDATE, }; +enum nft_dynset_flags { +NFT_DYNSET_F_INV = (1 <<0 ), +}; +/** * enum nft_dynset_attributes - dynset expression attributes *
@@ -585,6 +589,7 @@ enum nft_dynset_ops {* @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32) * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64) * @NFTA_DYNSET_EXPR: expression (NLA_NESTED: nft_expr_attributes) +* @NFTA_DYNSET_FLAGS: flags (NLA_U32) */ enum nft_dynset_attributes {NFTA_DYNSET_UNSPEC ,
@@ -596,6 +601,7 @@ enum nft_dynset_attributes {NFTA_DYNSET_TIMEOUT ,NFTA_DYNSET_EXPR ,NFTA_DYNSET_PAD , +NFTA_DYNSET_FLAGS , __NFTA_DYNSET_MAX, };#define NFTA_DYNSET_MAX (__NFTA_DYNSET_MAX - 1)
net/netfilter/nft_dynset.c +19 -1
@@ -22,6 +22,7 @@ struct nft_dynset { enum nft_dynset_ops op:8; enum nft_registers sreg_key:8; enum nft_registers sreg_data:8; +bool invert;u64 timeout;struct nft_expr *expr;struct nft_set_binding binding;
@@ -82,10 +83,14 @@ static void nft_dynset_eval(const struct nft_expr *expr,if (sexpr !=NULL ) sexpr->ops->eval (sexpr, regs, pkt); + +if (priv->invert) + regs->verdict.code =NFT_BREAK ;return ; } out: - regs->verdict.code =NFT_BREAK ; +if (!priv->invert) + regs->verdict.code =NFT_BREAK ; }static const struct nla_policy nft_dynset_policy[NFTA_DYNSET_MAX +1 ] = {
@@ -96,6 +101,7 @@ static const struct nla_policy nft_dynset_policy[NFTA_DYNSET_MAX + 1] = { [NFTA_DYNSET_SREG_DATA] = { .type = NLA_U32 }, [NFTA_DYNSET_TIMEOUT] = { .type = NLA_U64 }, [NFTA_DYNSET_EXPR] = { .type = NLA_NESTED }, + [NFTA_DYNSET_FLAGS] = { .type = NLA_U32 }, }; static int nft_dynset_init(const struct nft_ctx *ctx,
@@ -113,6 +119,15 @@ static int nft_dynset_init(const struct nft_ctx *ctx, tb[NFTA_DYNSET_SREG_KEY] == NULL)return -EINVAL ; +if (tb[NFTA_DYNSET_FLAGS ]) { +u32 flags =ntonl (nla_get_be32 (tb[NFTA_DYNSET_FLAGS ])); + +if (flags & ~NFT_DYNSET_F_INV ) +return -EINVAL ; +if (flags &NFT_DYNSET_F_INV ) + priv->invert = true; + } + set =nf_tables_set_lookup (ctx->table, tb[NFTA_DYNSET_SET_NAME ], genmask);if (IS_ERR (set)) {
@@ -220,6 +235,7 @@ static void nft_dynset_destroy(const struct nft_ctx *ctx,static int nft_dynset_dump (struct sk_buff *skb,const struct nft_expr *expr) {const struct nft_dynset *priv =nft_expr_priv (expr); +u32 flags = priv->invert ?NFT_DYNSET_F_INV :0 ;if (nft_dump_register (skb,NFTA_DYNSET_SREG_KEY , priv->sreg_key)) goto nla_put_failure;
@@ -235,6 +251,8 @@ static int nft_dynset_dump(struct sk_buff *skb, const struct nft_expr *expr) goto nla_put_failure;if (priv->expr &&nft_expr_dump (skb,NFTA_DYNSET_EXPR , priv->expr)) goto nla_put_failure; +if (nla_put_be32 (skb,NFTA_DYNSET_FLAGS ,htonl (flags))) + goto nla_put_failure;return 0 ; nla_put_failure:
Signature · 1 line
2.1.4
kbuild test robot
build botreproduce:
Hi Pablo,
[auto build test ERROR on nf-next/master]
url: https://github.com/0day-ci/linux/commits/Pablo-Neira-Ayuso/netfilter-nft_dynset-allow-to-invert-match-criteria/20160819-114223 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master config: x86_64-rhel (attached as .config) compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All errors (new ones prefixed by >>):
net/netfilter/nft_dynset.c: In function 'nft_dynset_init':
>> net/netfilter/nft_dynset.c:123:15: error: implicit declaration of function 'ntonl' [-Werror=implicit-function-declaration]
u32 flags = ntonl(nla_get_be32(tb[NFTA_DYNSET_FLAGS]));
^~~~~cc1: some warnings being treated as errors
vim +/ntonl +123 net/netfilter/nft_dynset.c
117 if (tb[NFTA_DYNSET_SET_NAME] == NULL ||
118 tb[NFTA_DYNSET_OP] == NULL ||
119 tb[NFTA_DYNSET_SREG_KEY] == NULL)
120 return -EINVAL;
121
122 if (tb[NFTA_DYNSET_FLAGS]) {
> 123 u32 flags = ntonl(nla_get_be32(tb[NFTA_DYNSET_FLAGS]));
124
125 if (flags & ~NFT_DYNSET_F_INV)
126 return -EINVAL;
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation