Netfilter fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) br_netfilter drops IPv6 packets if ipv6 is disabled, from Leonardo Bras.
2) nft_socket hits BUG() due to illegal skb->sk caching, patch from Fernando Fernandez Mancera.
3) nft_fib_netdev could be called with ipv6 disabled, leading to crash in the fib lookup, also from Leonardo.
4) ctnetlink honors IPS_OFFLOAD flag, just like nf_conntrack sysctl does.
5) Properly set up flowtable entry timeout, otherwise immediate removal by garbage collector might occur.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit e33b4325e60e146c2317a8b548cbd633239ff83b:
net: stmmac: dwmac-sun8i: Variable "val" in function sun8i_dwmac_set_syscon() could be uninitialized (2019-09-02 11:48:15 -0700)
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 110e48725db6262f260f10727d0fb2d3d25895e4:
netfilter: nf_flow_table: set default timeout after successful insertion (2019-09-03 22:55:42 +0200)
----------------------------------------------------------------
Fernando Fernandez Mancera (1):
netfilter: nft_socket: fix erroneous socket assignment
Leonardo Bras (2):
netfilter: bridge: Drops IPv6 packets if IPv6 module is not loaded
netfilter: nft_fib_netdev: Terminate rule eval if protocol=IPv6 and ipv6 module is disabled
Pablo Neira Ayuso (2):
netfilter: ctnetlink: honor IPS_OFFLOAD flag
netfilter: nf_flow_table: set default timeout after successful insertion
net/bridge/br_netfilter_hooks.c | 4 ++++ net/netfilter/nf_conntrack_netlink.c | 7 +++++-- net/netfilter/nf_flow_table_core.c | 2 +- net/netfilter/nft_fib_netdev.c | 3 +++ net/netfilter/nft_socket.c | 6 +++--- 5 files changed, 16 insertions(+), 6 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/5 netfilter: bridge: Drops IPv6 packets if IPv6 module is not loaded
From: Leonardo Bras <[email protected]>
A kernel panic can happen if a host has disabled IPv6 on boot and have to process guest packets (coming from a bridge) using it's ip6tables.
IPv6 packets need to be dropped if the IPv6 module is not loaded, and the host ip6tables will be used.
--- net/bridge/br_netfilter_hooks.c | 4 ++++ 1 file changed, 4 insertions(+)
net/bridge/br_netfilter_hooks.c +4 -0
@@ -496,6 +496,10 @@ static unsigned int br_nf_pre_routing(void *priv,if (!brnet->call_ip6tables && !br_opt_get (br,BROPT_NF_CALL_IP6TABLES ))return NF_ACCEPT ; +if (!ipv6_mod_enabled ()) { +pr_warn_once ("Module ipv6 is disabled, so call_ip6tables is not supported." ); +return NF_DROP ; + }nf_bridge_pull_encap_header_rcsum (skb);return br_nf_pre_routing_ipv6 (priv, skb, state);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/5 netfilter: nft_fib_netdev: Terminate rule eval if protocol=IPv6 and ipv6 module is disabled
In reply to Pablo Neira AyusoFrom: Leonardo Bras <[email protected]>
If IPv6 is disabled on boot (ipv6.disable=1), but nft_fib_inet ends up dealing with a IPv6 packet, it causes a kernel panic in fib6_node_lookup_1(), crashing in bad_page_fault.
The panic is caused by trying to deference a very low address (0x38 in ppc64le), due to ipv6.fib6_main_tbl = NULL.
BUG: Kernel NULL pointer dereference at 0x00000038
The kernel panic was reproduced in a host that disabled IPv6 on boot and have to process guest packets (coming from a bridge) using it's ip6tables.
Terminate rule evaluation when packet protocol is IPv6 but the ipv6 module is not loaded.
--- net/netfilter/nft_fib_netdev.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_fib_netdev.c +3 -0
@@ -14,6 +14,7 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> +#include <net/ipv6.h> #include <net/netfilter/nft_fib.h>
@@ -34,6 +35,8 @@ static void nft_fib_netdev_eval(const struct nft_expr *expr, }break ;case ETH_P_IPV6 : +if (!ipv6_mod_enabled ()) +break ;switch (priv->result) {case NFT_FIB_RESULT_OIF :case NFT_FIB_RESULT_OIFNAME :
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/5 netfilter: nf_flow_table: set default timeout after successful insertion
In reply to Pablo Neira AyusoSet up the default timeout for this new entry otherwise the garbage collector might quickly remove it right after the flowtable insertion.
--- net/netfilter/nf_flow_table_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_flow_table_core.c +1 -1
@@ -217,7 +217,7 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)return err; } - flow->timeout = (u32 )jiffies; + flow->timeout = (u32 )jiffies +NF_FLOW_TIMEOUT ;return 0 ; }EXPORT_SYMBOL_GPL (flow_offload_add);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/5 netfilter: nft_socket: fix erroneous socket assignment
In reply to Pablo Neira AyusoFrom: Fernando Fernandez Mancera <[email protected]>
The socket assignment is wrong, see skb_orphan():
When skb->destructor callback is not set, but skb->sk is set, this hits BUG().
--- net/netfilter/nft_socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_socket.c +3 -3
@@ -47,9 +47,6 @@ static void nft_socket_eval(const struct nft_expr *expr,return ; } -/* So that subsequent socket matching not to require other lookups. */ - skb->sk = sk; -switch (priv->key) {case NFT_SOCKET_TRANSPARENT :nft_reg_store8 (dest,inet_sk_transparent (sk));
@@ -66,6 +63,9 @@ static void nft_socket_eval(const struct nft_expr *expr,WARN_ON (1 ); regs->verdict.code =NFT_BREAK ; } + +if (sk != skb->sk) +sock_gen_put (sk); }static const struct nla_policy nft_socket_policy[NFTA_SOCKET_MAX +1 ] = {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/5 netfilter: ctnetlink: honor IPS_OFFLOAD flag
In reply to Pablo Neira AyusoIf this flag is set, timeout and state are irrelevant to userspace.
--- net/netfilter/nf_conntrack_netlink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_netlink.c +5 -2
@@ -553,10 +553,8 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, goto nla_put_failure; if (ctnetlink_dump_status(skb, ct) < 0 || - ctnetlink_dump_timeout(skb, ct) < 0 || ctnetlink_dump_acct(skb, ct, type) < 0 || ctnetlink_dump_timestamp(skb, ct) < 0 || - ctnetlink_dump_protoinfo(skb, ct) < 0 || ctnetlink_dump_helpinfo(skb, ct) < 0 || ctnetlink_dump_mark(skb, ct) < 0 || ctnetlink_dump_secctx(skb, ct) < 0 ||
@@ -568,6 +566,11 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, ctnetlink_dump_ct_synproxy(skb, ct) < 0) goto nla_put_failure; +if (!test_bit (IPS_OFFLOAD_BIT , &ct->status) && + (ctnetlink_dump_timeout (skb, ct) <0 || +ctnetlink_dump_protoinfo (skb, ct) <0 )) + goto nla_put_failure; +nlmsg_end (skb, nlh);return skb->len;
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Wed, 4 Sep 2019 21:36:41 +0200
Quoted 10 lines
The following patchset contains Netfilter fixes for net:
1)
br_netfilterdrops IPv6 packets if ipv6 is disabled, from Leonardo Bras.2)
nft_sockethitsBUG()due to illegalskb->skcaching, patch from Fernando Fernandez Mancera.3)
nft_fib_netdevcould be called with ipv6 disabled, leading to crash in the fib lookup, also from Leonardo.
Quoted 8 lines
4) ctnetlink honors
IPS_OFFLOADflag, just likenf_conntracksysctl does.5) Properly set up flowtable entry timeout, otherwise immediate removal by garbage collector might occur.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks.