netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 11/14] netfilter: nf_tables: return EBUSY if device already belongs to flowtable
Date: Fri,  2 Mar 2018 21:32:59 +0100	[thread overview]
Message-ID: <20180302203302.3724-12-pablo@netfilter.org> (raw)
In-Reply-To: <20180302203302.3724-1-pablo@netfilter.org>

If the netdevice is already part of a flowtable, return EBUSY. I cannot
find a valid usecase for having two flowtables bound to the same
netdevice. We can still have two flowtable where the device set is
disjoint.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_tables_api.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 8b9fe30de0cd..43acdeef045d 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5037,9 +5037,9 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk,
 {
 	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
 	const struct nf_flowtable_type *type;
+	struct nft_flowtable *flowtable, *ft;
 	u8 genmask = nft_genmask_next(net);
 	int family = nfmsg->nfgen_family;
-	struct nft_flowtable *flowtable;
 	struct nft_table *table;
 	struct nft_ctx ctx;
 	int err, i, k;
@@ -5099,6 +5099,22 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk,
 		goto err3;
 
 	for (i = 0; i < flowtable->ops_len; i++) {
+		if (!flowtable->ops[i].dev)
+			continue;
+
+		list_for_each_entry(ft, &table->flowtables, list) {
+			for (k = 0; k < ft->ops_len; k++) {
+				if (!ft->ops[k].dev)
+					continue;
+
+				if (flowtable->ops[i].dev == ft->ops[k].dev &&
+				    flowtable->ops[i].pf == ft->ops[k].pf) {
+					err = -EBUSY;
+					goto err4;
+				}
+			}
+		}
+
 		err = nf_register_net_hook(net, &flowtable->ops[i]);
 		if (err < 0)
 			goto err4;
-- 
2.11.0

  parent reply	other threads:[~2018-03-02 20:33 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-02 20:32 [PATCH 00/14] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 01/14] netfilter: ipt_CLUSTERIP: put config struct if we can't increment ct refcount Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 02/14] netfilter: ipt_CLUSTERIP: put config instead of freeing it Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 03/14] netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 04/14] netfilter: bridge: ebt_among: add missing match size checks Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 05/14] netfilter: ebtables: convert BUG_ONs to WARN_ONs Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 06/14] netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 07/14] netfilter: nf_flow_table: fix checksum when handling DNAT Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 08/14] netfilter: increase IPSTATS_MIB_CSUMERRORS stat Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 09/14] netfilter: don't set F_IFACE on ipv6 fib lookups Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 10/14] netfilter: use skb_to_full_sk in ip6_route_me_harder Pablo Neira Ayuso
2018-03-02 20:32 ` Pablo Neira Ayuso [this message]
2018-03-02 20:33 ` [PATCH 12/14] netfilter: nf_tables: missing attribute validation in nf_tables_delflowtable() Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 13/14] netfilter: nf_tables: use the right index from flowtable error path Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 14/14] ipvs: remove IPS_NAT_MASK check to fix passive FTP Pablo Neira Ayuso
2018-03-03  1:32 ` [PATCH 00/14] Netfilter/IPVS fixes for net David Miller

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=20180302203302.3724-12-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --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).