Netfilter fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi David,
The following patchset contains Netfilter fixes for net:
1) Use CONFIG_NF_TABLES_INET from seltests, not NF_TABLES_INET. From Naresh Kamboju.
2) Add a test to cover masquerading and redirect case, from Florian Westphal.
3) Two packets coming from the same socket may race to set up NAT, ending up with different tuples and the packet losing race being dropped. Update nf_conntrack_tuple_taken() to exercise clash resolution for this case. From Martynas Pumputis and Florian Westphal.
4) Unbind anonymous sets from the commit and abort path, this fixes a splat due to double set list removal/release in case that the transaction needs to be aborted.
5) Do not preserve original output interface for packets that are redirected in the output chain when ip6_route_me_harder() is called. Otherwise packets end up going not going to the loopback device. From Eli Cooper.
6) Fix bogus splat in nft_compat with CONFIG_REFCOUNT_FULL=y, this also simplifies the existing logic to deal with the list insertions of the xtables extensions. From Florian Westphal.
Diffstat look rather larger than usual because of the new selftest, but Florian and I consider that having tests soon into the tree is good to improve coverage. If there's a different policy in this regard, please, let me know.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit cfe4bd7a257f6d6f81d3458d8c9d9ec4957539e6:
sctp: check and update stream->out_curr when allocating stream_out (2019-02-03 14:27:47 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 947e492c0fc2132ae5fca081a9c2952ccaab0404:
netfilter: nft_compat: don't use refcount_inc on newly allocated entry (2019-02-05 14:10:33 +0100)
----------------------------------------------------------------
Eli Cooper (1):
netfilter: ipv6: Don't preserve original oif for loopback address
Florian Westphal (2):
selftests: netfilter: add simple masq/redirect test cases
netfilter: nft_compat: don't use refcount_inc on newly allocated entry
Martynas Pumputis (1):
netfilter: nf_nat: skip nat clash resolution for same-origin entries
Naresh Kamboju (1):
selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET
Pablo Neira Ayuso (1):
netfilter: nf_tables: unbind set in rule from commit path
include/net/netfilter/nf_tables.h | 17 +- net/ipv6/netfilter.c | 4 +- net/netfilter/nf_conntrack_core.c | 16 + net/netfilter/nf_tables_api.c | 85 ++- net/netfilter/nft_compat.c | 62 +-- net/netfilter/nft_dynset.c | 18 +- net/netfilter/nft_immediate.c | 6 +- net/netfilter/nft_lookup.c | 18 +- net/netfilter/nft_objref.c | 18 +- tools/testing/selftests/netfilter/Makefile | 2 +- tools/testing/selftests/netfilter/config | 2 +- tools/testing/selftests/netfilter/nft_nat.sh | 762 +++++++++++++++++++++++++++ 12 files changed, 888 insertions(+), 122 deletions(-) create mode 100755 tools/testing/selftests/netfilter/nft_nat.sh
Pablo Neira Ayuso
maintainerPATCH 1/6 selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET
From: Naresh Kamboju <[email protected]>
In selftests the config fragment for netfilter was added as NF_TABLES_INET=y and this patch correct it as CONFIG_NF_TABLES_INET=y
--- tools/testing/selftests/netfilter/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/netfilter/config +1 -1
@@ -1,2 +1,2 @@ CONFIG_NET_NS=y -NF_TABLES_INET=y +CONFIG_NF_TABLES_INET=y
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/6 selftests: netfilter: add simple masq/redirect test cases
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Check basic nat/redirect/masquerade for ipv4 and ipv6.
--- tools/testing/selftests/netfilter/Makefile | 2 +- tools/testing/selftests/netfilter/nft_nat.sh | 762 +++++++++++++++++++++++++++ 2 files changed, 763 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/netfilter/nft_nat.sh
tools/testing/selftests/netfilter/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for netfilter selftests -TEST_PROGS := nft_trans_stress.sh +TEST_PROGS := nft_trans_stress.sh nft_nat.sh include ../lib.mk
tools/testing/selftests/netfilter/nft_nat.sh new file +762 -0
762 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/6 netfilter: nf_nat: skip nat clash resolution for same-origin entries
In reply to Pablo Neira AyusoFrom: Martynas Pumputis <[email protected]>
It is possible that two concurrent packets originating from the same socket of a connection-less protocol (e.g. UDP) can end up having different IP_CT_DIR_REPLY tuples which results in one of the packets being dropped.
To illustrate this, consider the following simplified scenario:
1. Packet A and B are sent at the same time from two different threads by same UDP socket. No matching conntrack entry exists yet. Both packets cause allocation of a new conntrack entry.
2. get_unique_tuple gets called for A. No clashing entry found. conntrack entry for A is added to main conntrack table.
3. get_unique_tuple is called for B and will find that the reply tuple of B is already taken by A.
It will allocate a new UDP source port for B to resolve the clash.
4. conntrack entry for B cannot be added to main conntrack table because its ORIGINAL direction is clashing with A and the REPLY directions of A and B are not the same anymore due to UDP source port reallocation done in step 3.
This patch modifies nf_conntrack_tuple_taken so it doesn't consider colliding reply tuples if the IP_CT_DIR_ORIGINAL tuples are equal.
[ Florian: simplify patch to not use .allow_clash setting
and always ignore identical flows ]
--- net/netfilter/nf_conntrack_core.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
net/netfilter/nf_conntrack_core.c +16 -0
@@ -1007,6 +1007,22 @@ nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple, }if (nf_ct_key_equal (h, tuple, zone, net)) { +/* Tuple is taken already, so caller will need to find +* a new source port to use. +* +* Only exception: +* If the *original tuples* are identical, then both +* conntracks refer to the same flow. +* This is a rare situation, it can occur e.g. when +* more than one UDP packet is sent from same socket +* in different threads. +* +* Let nf_ct_resolve_clash() deal with this later. +*/ +if (nf_ct_tuple_equal (&ignored_conntrack->tuplehash[IP_CT_DIR_ORIGINAL ].tuple, + &ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple)) +continue ; +NF_CT_STAT_INC_ATOMIC (net, found);rcu_read_unlock ();return 1 ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/6 netfilter: nf_tables: unbind set in rule from commit path
In reply to Pablo Neira AyusoAnonymous sets that are bound to rules from the same transaction trigger a kernel splat from the abort path due to double set list removal and double free.
This patch updates the logic to search for the transaction that is responsible for creating the set and disable the set list removal and release, given the rule is now responsible for this. Lookup is reverse since the transaction that adds the set is likely to be at the tail of the list.
Moreover, this patch adds the unbind step to deliver the event from the commit path. This should not be done from the worker thread, since we have no guarantees of in-order delivery to the listener.
This patch removes the assumption that both activate and deactivate callbacks need to be provided.
--- include/net/netfilter/nf_tables.h | 17 ++++++-- net/netfilter/nf_tables_api.c | 85 +++++++++++++++++++-------------------- net/netfilter/nft_compat.c | 6 ++- net/netfilter/nft_dynset.c | 18 ++++----- net/netfilter/nft_immediate.c | 6 ++- net/netfilter/nft_lookup.c | 18 ++++----- net/netfilter/nft_objref.c | 18 ++++----- 7 files changed, 85 insertions(+), 83 deletions(-)
include/net/netfilter/nf_tables.h +13 -4
@@ -469,9 +469,7 @@ struct nft_set_binding {int nf_tables_bind_set (const struct nft_ctx *ctx,struct nft_set *set,struct nft_set_binding *binding);void nf_tables_unbind_set (const struct nft_ctx *ctx,struct nft_set *set, -struct nft_set_binding *binding); -void nf_tables_rebind_set (const struct nft_ctx *ctx,struct nft_set *set, -struct nft_set_binding *binding); +struct nft_set_binding *binding,bool commit);void nf_tables_destroy_set (const struct nft_ctx *ctx,struct nft_set *set);/**
@@ -721,6 +719,13 @@ struct nft_expr_type {#define NFT_EXPR_STATEFUL 0x1#define NFT_EXPR_GC 0x2 +enum nft_trans_phase { +NFT_TRANS_PREPARE , +NFT_TRANS_ABORT , +NFT_TRANS_COMMIT , +NFT_TRANS_RELEASE +}; +/** * struct nft_expr_ops - nf_tables expression operations *
@@ -750,7 +755,8 @@ struct nft_expr_ops {void (*activate)(const struct nft_ctx *ctx,const struct nft_expr *expr);void (*deactivate)(const struct nft_ctx *ctx, -const struct nft_expr *expr); +const struct nft_expr *expr, +enum nft_trans_phase phase);void (*destroy)(const struct nft_ctx *ctx,const struct nft_expr *expr); void (*destroy_clone)(const struct nft_ctx *ctx,
@@ -1323,12 +1329,15 @@ struct nft_trans_rule {struct nft_trans_set {struct nft_set *set;u32 set_id; +bool bound; };#define nft_trans_set (trans) \ (((struct nft_trans_set *)trans->data)->set)#define nft_trans_set_id (trans) \ (((struct nft_trans_set *)trans->data)->set_id) +#define nft_trans_set_bound (trans) \ + (((struct nft_trans_set *)trans->data)->bound)struct nft_trans_chain {bool update;
net/netfilter/nf_tables_api.c +41 -44
178 lines not on this page · raw message
net/netfilter/nft_compat.c +5 -1
@@ -587,10 +587,14 @@ static void nft_compat_activate_tg(const struct nft_ctx *ctx, }static void nft_compat_deactivate (const struct nft_ctx *ctx, -const struct nft_expr *expr) +const struct nft_expr *expr, +enum nft_trans_phase phase) { struct nft_xt *xt = container_of(expr->ops, struct nft_xt, ops); +if (phase ==NFT_TRANS_COMMIT ) +return ; +if (--xt->listcnt ==0 )list_del_init (&xt->head); }
net/netfilter/nft_dynset.c +7 -11
@@ -235,20 +235,17 @@ static int nft_dynset_init(const struct nft_ctx *ctx,return err; } -static void nft_dynset_activate (const struct nft_ctx *ctx, -const struct nft_expr *expr) -{ -struct nft_dynset *priv =nft_expr_priv (expr); - -nf_tables_rebind_set (ctx, priv->set, &priv->binding); -} -static void nft_dynset_deactivate (const struct nft_ctx *ctx, -const struct nft_expr *expr) +const struct nft_expr *expr, +enum nft_trans_phase phase) {struct nft_dynset *priv =nft_expr_priv (expr); -nf_tables_unbind_set (ctx, priv->set, &priv->binding); +if (phase ==NFT_TRANS_PREPARE ) +return ; + +nf_tables_unbind_set (ctx, priv->set, &priv->binding, + phase ==NFT_TRANS_COMMIT ); } static void nft_dynset_destroy(const struct nft_ctx *ctx,
@@ -296,7 +293,6 @@ static const struct nft_expr_ops nft_dynset_ops = { .eval = nft_dynset_eval, .init = nft_dynset_init, .destroy = nft_dynset_destroy, - .activate = nft_dynset_activate, .deactivate = nft_dynset_deactivate, .dump = nft_dynset_dump, };
net/netfilter/nft_immediate.c +5 -1
@@ -72,10 +72,14 @@ static void nft_immediate_activate(const struct nft_ctx *ctx, }static void nft_immediate_deactivate (const struct nft_ctx *ctx, -const struct nft_expr *expr) +const struct nft_expr *expr, +enum nft_trans_phase phase) {const struct nft_immediate_expr *priv =nft_expr_priv (expr); +if (phase ==NFT_TRANS_COMMIT ) +return ; +return nft_data_release (&priv->data,nft_dreg_to_type (priv->dreg)); }
net/netfilter/nft_lookup.c +7 -11
@@ -121,20 +121,17 @@ static int nft_lookup_init(const struct nft_ctx *ctx,return 0 ; } -static void nft_lookup_activate (const struct nft_ctx *ctx, -const struct nft_expr *expr) -{ -struct nft_lookup *priv =nft_expr_priv (expr); - -nf_tables_rebind_set (ctx, priv->set, &priv->binding); -} -static void nft_lookup_deactivate (const struct nft_ctx *ctx, -const struct nft_expr *expr) +const struct nft_expr *expr, +enum nft_trans_phase phase) {struct nft_lookup *priv =nft_expr_priv (expr); -nf_tables_unbind_set (ctx, priv->set, &priv->binding); +if (phase ==NFT_TRANS_PREPARE ) +return ; + +nf_tables_unbind_set (ctx, priv->set, &priv->binding, + phase ==NFT_TRANS_COMMIT ); } static void nft_lookup_destroy(const struct nft_ctx *ctx,
@@ -225,7 +222,6 @@ static const struct nft_expr_ops nft_lookup_ops = { .size = NFT_EXPR_SIZE(sizeof(struct nft_lookup)), .eval = nft_lookup_eval, .init = nft_lookup_init, - .activate = nft_lookup_activate, .deactivate = nft_lookup_deactivate, .destroy = nft_lookup_destroy, .dump = nft_lookup_dump,
net/netfilter/nft_objref.c +7 -11
@@ -155,20 +155,17 @@ static int nft_objref_map_dump(struct sk_buff *skb, const struct nft_expr *expr)return -1 ; } -static void nft_objref_map_activate (const struct nft_ctx *ctx, -const struct nft_expr *expr) -{ -struct nft_objref_map *priv =nft_expr_priv (expr); - -nf_tables_rebind_set (ctx, priv->set, &priv->binding); -} -static void nft_objref_map_deactivate (const struct nft_ctx *ctx, -const struct nft_expr *expr) +const struct nft_expr *expr, +enum nft_trans_phase phase) {struct nft_objref_map *priv =nft_expr_priv (expr); -nf_tables_unbind_set (ctx, priv->set, &priv->binding); +if (phase ==NFT_TRANS_PREPARE ) +return ; + +nf_tables_unbind_set (ctx, priv->set, &priv->binding, + phase ==NFT_TRANS_COMMIT ); } static void nft_objref_map_destroy(const struct nft_ctx *ctx,
@@ -185,7 +182,6 @@ static const struct nft_expr_ops nft_objref_map_ops = { .size = NFT_EXPR_SIZE(sizeof(struct nft_objref_map)), .eval = nft_objref_map_eval, .init = nft_objref_map_init, - .activate = nft_objref_map_activate, .deactivate = nft_objref_map_deactivate, .destroy = nft_objref_map_destroy, .dump = nft_objref_map_dump,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/6 netfilter: ipv6: Don't preserve original oif for loopback address
In reply to Pablo Neira AyusoFrom: Eli Cooper <[email protected]>
Commit 508b09046c0f ("netfilter: ipv6: Preserve link scope traffic original oif") made ip6_route_me_harder() keep the original oif for link-local and multicast packets. However, it also affected packets for the loopback address because it used rt6_need_strict().
REDIRECT rules in the OUTPUT chain rewrite the destination to loopback address; thus its oif should not be preserved. This commit fixes the bug that redirected local packets are being dropped. Actually the packet was not exactly dropped; Instead it was sent out to the original oif rather than lo. When a packet with daddr ::1 is sent to the router, it is effectively dropped.
--- net/ipv6/netfilter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv6/netfilter.c +3 -1
@@ -23,9 +23,11 @@ int ip6_route_me_harder(struct net *net, struct sk_buff *skb)struct sock *sk =sk_to_full_sk (skb->sk);unsigned int hh_len;struct dst_entry *dst; +int strict = (ipv6_addr_type (&iph->daddr) & + (IPV6_ADDR_MULTICAST |IPV6_ADDR_LINKLOCAL ));struct flowi6 fl6 = { .flowi6_oif = sk && sk->sk_bound_dev_if ? sk->sk_bound_dev_if : -rt6_need_strict (&iph->daddr) ?skb_dst (skb)->dev->ifindex :0 , + strict ?skb_dst (skb)->dev->ifindex :0 , .flowi6_mark = skb->mark, .flowi6_uid =sock_net_uid (net, sk), .daddr = iph->daddr,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/6 netfilter: nft_compat: don't use refcount_inc on newly allocated entry
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
When I moved the refcount to refcount_t type I missed the fact that refcount_inc() will result in use-after-free warning with CONFIG_REFCOUNT_FULL=y builds.
The correct fix would be to init the reference count to 1 at allocation time, but, unfortunately we cannot do this, as we can't undo that in case something else fails later in the batch.
So only solution I see is to special-case the 'new entry' condition and replace refcount_inc() with a "delayed" refcount_set(1) in this case, as done here.
The .activate callback can be removed to simplify things, we only need to make sure that deactivate() decrements/unlinks the entry from the list at end of transaction phase (commit or abort).
--- net/netfilter/nft_compat.c | 62 +++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 39 deletions(-)
net/netfilter/nft_compat.c +23 -39
@@ -61,6 +61,21 @@ static struct nft_compat_net *nft_compat_pernet(struct net *net)return net_generic (net, nft_compat_net_id); } +static void nft_xt_get (struct nft_xt *xt) +{ +/* refcount_inc() warns on 0 -> 1 transition, but we can't +* init the reference count to 1 in .select_ops -- we can't +* undo such an increase when another expression inside the same +* rule fails afterwards. +*/ +if (xt->listcnt ==0 ) +refcount_set (&xt->refcnt,1 ); +else +refcount_inc (&xt->refcnt); + + xt->listcnt++; +} +static bool nft_xt_put (struct nft_xt *xt) {if (refcount_dec_and_test (&xt->refcnt)) {
@@ -291,7 +306,7 @@ nft_target_init(const struct nft_ctx *ctx, const struct nft_expr *expr,return -EINVAL ; nft_xt = container_of(expr->ops, struct nft_xt, ops); -refcount_inc (&nft_xt->refcnt); +nft_xt_get (nft_xt);return 0 ; }
@@ -504,7 +519,7 @@ __nft_match_init(const struct nft_ctx *ctx, const struct nft_expr *expr,return ret; nft_xt = container_of(expr->ops, struct nft_xt, ops); -refcount_inc (&nft_xt->refcnt); +nft_xt_get (nft_xt);return 0 ; }
@@ -558,45 +573,16 @@ nft_match_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)__nft_match_destroy (ctx, expr,nft_expr_priv (expr)); } -static void nft_compat_activate (const struct nft_ctx *ctx, -const struct nft_expr *expr, -struct list_head *h) -{ - struct nft_xt *xt = container_of(expr->ops, struct nft_xt, ops); - -if (xt->listcnt ==0 ) -list_add (&xt->head, h); - - xt->listcnt++; -} - -static void nft_compat_activate_mt (const struct nft_ctx *ctx, -const struct nft_expr *expr) -{ -struct nft_compat_net *cn =nft_compat_pernet (ctx->net); - -nft_compat_activate (ctx, expr, &cn->nft_match_list); -} - -static void nft_compat_activate_tg (const struct nft_ctx *ctx, -const struct nft_expr *expr) -{ -struct nft_compat_net *cn =nft_compat_pernet (ctx->net); - -nft_compat_activate (ctx, expr, &cn->nft_target_list); -} -static void nft_compat_deactivate (const struct nft_ctx *ctx,const struct nft_expr *expr,enum nft_trans_phase phase) { struct nft_xt *xt = container_of(expr->ops, struct nft_xt, ops); -if (phase ==NFT_TRANS_COMMIT ) -return ; - -if (--xt->listcnt ==0 ) -list_del_init (&xt->head); +if (phase ==NFT_TRANS_ABORT || phase ==NFT_TRANS_COMMIT ) { +if (--xt->listcnt ==0 ) +list_del_init (&xt->head); + } } static void
@@ -852,7 +838,6 @@ nft_match_select_ops(const struct nft_ctx *ctx, nft_match->ops.eval = nft_match_eval; nft_match->ops.init = nft_match_init; nft_match->ops.destroy = nft_match_destroy; - nft_match->ops.activate = nft_compat_activate_mt; nft_match->ops.deactivate = nft_compat_deactivate; nft_match->ops.dump = nft_match_dump; nft_match->ops.validate = nft_match_validate;
@@ -870,7 +855,7 @@ nft_match_select_ops(const struct nft_ctx *ctx, nft_match->ops.size = matchsize; - nft_match->listcnt =1 ; + nft_match->listcnt =0 ;list_add (&nft_match->head, &cn->nft_match_list);return &nft_match->ops;
@@ -957,7 +942,6 @@ nft_target_select_ops(const struct nft_ctx *ctx, nft_target->ops.size =NFT_EXPR_SIZE (XT_ALIGN (target->targetsize)); nft_target->ops.init = nft_target_init; nft_target->ops.destroy = nft_target_destroy; - nft_target->ops.activate = nft_compat_activate_tg; nft_target->ops.deactivate = nft_compat_deactivate; nft_target->ops.dump = nft_target_dump; nft_target->ops.validate = nft_target_validate;
@@ -968,7 +952,7 @@ nft_target_select_ops(const struct nft_ctx *ctx,else nft_target->ops.eval = nft_target_eval_xt; - nft_target->listcnt =1 ; + nft_target->listcnt =0 ;list_add (&nft_target->head, &cn->nft_target_list);return &nft_target->ops;
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Tue, 5 Feb 2019 20:04:09 +0100
Quoted 1 line
The following patchset contains Netfilter fixes for net:
...
Quoted 4 lines
Diffstat look rather larger than usual because of the new selftest, but Florian and I consider that having tests soon into the tree is good to improve coverage. If there's a different policy in this regard, please, let me know.
Adding a test case like this fine and in fact encouraged.
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks.