From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Patrick McHardy <kaber@trash.net>
Cc: herbert@gondor.apana.org.au, tgraf@suug.ch, davem@davemloft.net,
David.Laight@ACULAB.COM, ying.xue@windriver.com,
paulmck@linux.vnet.ibm.com, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 2/9] nftables: reject NFT_SET_ELEM_INTERVAL_END flag for non-interval sets
Date: Fri, 30 Jan 2015 18:31:07 +0100 [thread overview]
Message-ID: <20150130173107.GA9243@salvia> (raw)
In-Reply-To: <1422603994-5836-3-git-send-email-kaber@trash.net>
Hi Patrick,
Unless you have any concern, I'm going to apply this and 8/9 to
nf-next, so you don't need to resend these two sanitization fixes.
Thanks.
On Fri, Jan 30, 2015 at 07:46:27AM +0000, Patrick McHardy wrote:
> Signed-off-by: Patrick McHardy <kaber@trash.net>
> ---
> net/netfilter/nf_tables_api.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
> index 129a8da..92ba4a0 100644
> --- a/net/netfilter/nf_tables_api.c
> +++ b/net/netfilter/nf_tables_api.c
> @@ -3112,6 +3112,9 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
> elem.flags = ntohl(nla_get_be32(nla[NFTA_SET_ELEM_FLAGS]));
> if (elem.flags & ~NFT_SET_ELEM_INTERVAL_END)
> return -EINVAL;
> + if (!(set->flags & NFT_SET_INTERVAL) &&
> + elem.flags & NFT_SET_ELEM_INTERVAL_END)
> + return -EINVAL;
> }
>
> if (set->flags & NFT_SET_MAP) {
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-01-30 17:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-30 7:46 [PATCH 0/9 WIP] nf_tables: set extensions and dynamic updates Patrick McHardy
2015-01-30 7:46 ` [PATCH 1/9] rhashtable: simplify rhashtable_remove() Patrick McHardy
2015-01-30 16:36 ` Thomas Graf
2015-01-30 7:46 ` [PATCH 2/9] nftables: reject NFT_SET_ELEM_INTERVAL_END flag for non-interval sets Patrick McHardy
2015-01-30 17:31 ` Pablo Neira Ayuso [this message]
2015-01-30 17:55 ` Patrick McHardy
2015-01-30 18:00 ` Pablo Neira Ayuso
2015-01-30 7:46 ` [PATCH 3/9] nftables: nft_rbtree: fix locking Patrick McHardy
2015-01-30 10:52 ` Pablo Neira Ayuso
2015-01-30 7:46 ` [PATCH 4/9] netfilter: nf_tables: add set extensions Patrick McHardy
2015-01-30 7:46 ` [PATCH 5/9] netfilter: nf_tables: convert hash and rbtree to " Patrick McHardy
2015-01-30 7:46 ` [PATCH 6/9] netfilter: nf_tables: add set timeout support Patrick McHardy
2015-01-30 7:46 ` [PATCH 7/9] netfilter: nft_hash: add support for timeouts Patrick McHardy
2015-01-31 4:29 ` Herbert Xu
2015-01-31 12:16 ` Patrick McHardy
2015-01-30 7:46 ` [PATCH 8/9] netfilter: nft_lookup: add missing attribute validation for NFTA_LOOKUP_SET_ID Patrick McHardy
2015-01-30 7:46 ` [PATCH 9/9] netfilter: nf_tables: add support for dynamic set updates Patrick McHardy
2015-01-30 9:28 ` Herbert Xu
2015-01-30 10:08 ` Patrick McHardy
2015-01-30 10:18 ` Herbert Xu
2015-01-30 11:29 ` Herbert Xu
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=20150130173107.GA9243@salvia \
--to=pablo@netfilter.org \
--cc=David.Laight@ACULAB.COM \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=tgraf@suug.ch \
--cc=ying.xue@windriver.com \
/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).