From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH -nf v7] netfilter: nftables: add connlabel set support
Date: Thu, 5 May 2016 13:54:32 +0200 [thread overview]
Message-ID: <20160505115432.GA10879@salvia> (raw)
In-Reply-To: <1461664793-22342-1-git-send-email-fw@strlen.de>
On Tue, Apr 26, 2016 at 11:59:53AM +0200, Florian Westphal wrote:
> diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
> index 25998fa..4ef41a8 100644
> --- a/net/netfilter/nft_ct.c
> +++ b/net/netfilter/nft_ct.c
> @@ -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;
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.
next prev parent reply other threads:[~2016-05-05 11:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 9:59 [PATCH -nf v7] netfilter: nftables: add connlabel set support Florian Westphal
2016-04-26 10:00 ` Florian Westphal
2016-05-05 11:54 ` Pablo Neira Ayuso [this message]
2016-05-05 13:51 ` Florian Westphal
2016-05-05 14:28 ` Pablo Neira Ayuso
2016-05-05 14:35 ` Florian Westphal
2016-05-05 14:43 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160505115432.GA10879@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).