netfilter: nftables: add connlabel set support
Subsystems (2)
Florian Westphal
maintainerPATCH v7 1/1 netfilter: nftables: add connlabel set support
Conntrack labels are currently sized depending on the iptables ruleset, i.e. if we're asked to test or set bits 1, 2, and 65 then we would allocate enough room to store at least bit 65.
However, with nft, the input is just a register with arbitrary runtime content.
We therefore ask for the upper ceiling we currently have, which is enough room to store 128 bits.
Alternatively, we could alter nf_connlabel_replace to increase net->ct.label_words at run time, but since 128 bits is not that big we'd only save sizeof(long) so it doesn't seem worth it for now.
This follows a similar approach that xtables 'connlabel' match uses, so when user inputs
ct label set bar
then we will set the bit used by the 'bar' label and leave the rest alone.
This is done by passing the sreg content to nf_connlabels_replace as both value and mask argument.
Labels (bits) already set thus cannot be re-set to zero, but this is not supported by xtables connlabel match either.
---
Changes since v6:
- revert back to using an sreg, like in V1
Changes vs. V1:
- pass sreg also as a mask so existing labels are left alone
net/netfilter/nft_ct.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
net/netfilter/nft_ct.c +35 -0
@@ -198,9 +198,22 @@ static void nft_ct_set_eval(const struct nft_expr *expr, }break ;#endif +#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +if (nf_connlabels_replace (ct, + ®s->data[priv->sreg], + ®s->data[priv->sreg], +NF_CT_LABELS_MAX_SIZE /sizeof (u32))) + goto err; +break ; +#endif default :break ; } + +return ; +err: + regs->verdict.code =NFT_BREAK ; } static const struct nla_policy nft_ct_policy[NFTA_CT_MAX + 1] = {
@@ -365,6 +378,16 @@ static int nft_ct_set_init(const struct nft_ctx *ctx, len = FIELD_SIZEOF(struct nf_conn, mark);break ;#endif +#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +if (tb[NFTA_CT_DIRECTION ]) +return -EINVAL ; + len =NF_CT_LABELS_MAX_SIZE ; + err =nf_connlabels_get (ctx->net, (len *BITS_PER_BYTE ) -1 ); +if (err) +return err; +break ; +#endif default :return -EOPNOTSUPP ; }
@@ -384,6 +407,18 @@ static int nft_ct_set_init(const struct nft_ctx *ctx,static void nft_ct_destroy (const struct nft_ctx *ctx,const struct nft_expr *expr) { +struct nft_ct *priv =nft_expr_priv (expr); + +switch (priv->key) { +#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +nf_connlabels_put (ctx->net); +break ; +#endif +default : +break ; + } +nft_ct_l3proto_module_put (ctx->afi->family); }
Signature · 1 line
2.7.3
Florian Westphal
maintainerFlorian Westphal <[email protected]> wrote:
[..]
Just to clarify, this targets nf-next tree of course.
Pablo Neira Ayuso
maintainerQuoted 14 lines · Florian Westphal
net/netfilter/nft_ct.c +6
-0@@ -198,9 +198,22 @@ static void nft_ct_set_eval(const struct nft_expr *expr, }break ;#endif +#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +if (nf_connlabels_replace (ct, + ®s->data[priv->sreg], + ®s->data[priv->sreg], +NF_CT_LABELS_MAX_SIZE /sizeof (u32)))
net/netfilter/nft_ct.c static void nft_ct_set_eval(const struct nft_expr *expr, · line 216
Quoted 10 lines
net/netfilter/nft_ct.c +7
-0+ goto err; +break ; +#endif default :break ; } + +return ; +err: + regs->verdict.code =NFT_BREAK ;
This will trigger a warning when CONFIG_NF_CONNTRACK_LABELS is disabled (the err: label will be unused).
I have fixed this here with:
+#ifdef CONFIG_NF_CONNTRACK_LABELS
+ case NFT_CT_LABELS:
+ if (nf_connlabels_replace(ct,
+ ®s->data[priv->sreg],
+ ®s->data[priv->sreg],
+ NF_CT_LABELS_MAX_SIZE / sizeof(u32))) {+ regs->verdict.code = NFT_BREAK;
+ return;
+ }
+ break;
+#endif
But still I'm unsure we should stop evaluating the rule. How can we reach this error situation?
Let me know, I can fix this locally, no need to resend a new patch. Thanks.
Florian Westphal
maintainerQuoted 29 lines · Pablo Neira Ayuso
Quoted 14 lines · Florian Westphal
net/netfilter/nft_ct.c +6
-0@@ -198,9 +198,22 @@ static void nft_ct_set_eval(const struct nft_expr *expr, }break ;#endif +#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +if (nf_connlabels_replace (ct, + ®s->data[priv->sreg], + ®s->data[priv->sreg], +NF_CT_LABELS_MAX_SIZE /sizeof (u32)))net/netfilter/nft_ct.c static void nft_ct_set_eval(const struct nft_expr *expr, · line 216
Quoted 10 lines
net/netfilter/nft_ct.c +7
-0+ goto err; +break ; +#endif default :break ; } + +return ; +err: + regs->verdict.code =NFT_BREAK ;This will trigger a warning when
CONFIG_NF_CONNTRACK_LABELSis disabled (the err: label will be unused).
Quoted 1 line
I have fixed this here with:
Thanks, fix looks good!
Quoted 2 lines
But still I'm unsure we should stop evaluating the rule. How can we reach this error situation?
It happens when you hit a conntrack that doesn't have the connlabel extension attached because it predates the nft label set rule.
I don't mind changing this to not break and continue with evaluation (i followed what xt_connlabel does but we don't need to follow that
example).
Pablo Neira Ayuso
maintainerQuoted 10 lines · Florian Westphal
Quoted 2 lines · Pablo Neira Ayuso
But still I'm unsure we should stop evaluating the rule. How can we reach this error situation?
It happens when you hit a conntrack that doesn't have the connlabel extension attached because it predates the nft label set rule.
I don't mind changing this to not break and continue with evaluation (i followed what
xt_connlabeldoes but we don't need to follow that
example).
OK, then I'm going to simplify this to make it look like:
+#ifdef CONFIG_NF_CONNTRACK_LABELS
+ case NFT_CT_LABELS:
+ nf_connlabels_replace(ct,
+ ®s->data[priv->sreg], + ®s->data[priv->sreg], + NF_CT_LABELS_MAX_SIZE / sizeof(u32));
+ break;
+#endif
Florian Westphal
maintainernet/netfilter/nft_ct.c static void nft_ct_set_eval(const struct nft_expr *expr, · line 209
Quoted 10 lines · Pablo Neira Ayuso
OK, then I'm going to simplify this to make it look like:
net/netfilter/nft_ct.c +8
-0+#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +nf_connlabels_replace (ct, + ®s->data[priv->sreg], + ®s->data[priv->sreg], +NF_CT_LABELS_MAX_SIZE /sizeof (u32)); +break ; +#endif
I'm OK with this.
Pablo Neira Ayuso
maintainerQuoted 13 lines · Florian Westphal
net/netfilter/nft_ct.c static void nft_ct_set_eval(const struct nft_expr *expr, · line 209
Quoted 10 lines · Pablo Neira Ayuso
OK, then I'm going to simplify this to make it look like:
net/netfilter/nft_ct.c +8
-0+#ifdef CONFIG_NF_CONNTRACK_LABELS +case NFT_CT_LABELS : +nf_connlabels_replace (ct, + ®s->data[priv->sreg], + ®s->data[priv->sreg], +NF_CT_LABELS_MAX_SIZE /sizeof (u32)); +break ; +#endif I'm OK with this.
OK, pushed it out. Thanks for reviewing.