[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150130173107.GA9243@salvia>
Date: Fri, 30 Jan 2015 18:31:07 +0100
From: Pablo Neira Ayuso <pablo@...filter.org>
To: Patrick McHardy <kaber@...sh.net>
Cc: herbert@...dor.apana.org.au, tgraf@...g.ch, davem@...emloft.net,
David.Laight@...LAB.COM, ying.xue@...driver.com,
paulmck@...ux.vnet.ibm.com, netdev@...r.kernel.org,
netfilter-devel@...r.kernel.org
Subject: Re: [PATCH 2/9] nftables: reject NFT_SET_ELEM_INTERVAL_END flag for
non-interval sets
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@...sh.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@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists