Florian Westphal 3ece5c4bf6 netfilter: conntrack: fix boot failure with nf_conntrack.enable_hooks=1 ...

[ Upstream commit 339031bafe ]

This is a revert of
7b1957b049 ("netfilter: nf_defrag_ipv4: use net_generic infra")
and a partial revert of
8b0adbe3e3 ("netfilter: nf_defrag_ipv6: use net_generic infra").

If conntrack is builtin and kernel is booted with:
nf_conntrack.enable_hooks=1

.... kernel will fail to boot due to a NULL deref in
nf_defrag_ipv4_enable(): Its called before the ipv4 defrag initcall is
made, so net_generic() returns NULL.

To resolve this, move the user refcount back to struct net so calls
to those functions are possible even before their initcalls have run.

Fixes: 7b1957b049 ("netfilter: nf_defrag_ipv4: use net_generic infra")
Fixes: 8b0adbe3e3 ("netfilter: nf_defrag_ipv6: use net_generic infra").
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

2021-10-13 09:41:54 +02:00

..

arp_tables.c

netfilter: arptables: use pernet ops struct during unregister

2021-05-03 23:04:01 +02:00

arpt_mangle.c

netfilter: ipv4: prefer skb_ensure_writable

2019-05-31 18:02:46 +02:00

arptable_filter.c

netfilter: arptables: use pernet ops struct during unregister

2021-05-03 23:04:01 +02:00

ip_tables.c

netfilter: allow to turn off xtables compat layer

2021-04-26 18:16:56 +02:00

ipt_ah.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500

2019-06-19 17:09:55 +02:00

ipt_CLUSTERIP.c

netfilter: allow to turn off xtables compat layer

2021-04-26 18:16:56 +02:00

ipt_ECN.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-06-22 08:59:24 -04:00

ipt_REJECT.c

netfilter: use actual socket sk for REJECT action

2020-12-01 14:33:55 +01:00

ipt_rpfilter.c

netfilter: rpfilter: mask ecn bits before fib lookup

2021-01-19 13:54:30 -08:00

ipt_SYNPROXY.c

netfilter: Add MODULE_DESCRIPTION entries to kernel modules

2020-06-25 00:50:31 +02:00

iptable_filter.c

netfilter: ip_tables: pass table pointer via nf_hook_ops

2021-04-26 03:20:46 +02:00

iptable_mangle.c

netfilter: ip_tables: pass table pointer via nf_hook_ops

2021-04-26 03:20:46 +02:00

iptable_nat.c

netfilter: ip_tables: pass table pointer via nf_hook_ops

2021-04-26 03:20:46 +02:00

iptable_raw.c

netfilter: ip_tables: pass table pointer via nf_hook_ops

2021-04-26 03:20:46 +02:00

iptable_security.c

netfilter: ip_tables: pass table pointer via nf_hook_ops

2021-04-26 03:20:46 +02:00

Kconfig

netfilter: nf_log_arp: merge with nf_log_syslog

2021-03-31 00:37:27 +02:00

Makefile

netfilter: nf_log_arp: merge with nf_log_syslog

2021-03-31 00:37:27 +02:00

nf_defrag_ipv4.c

netfilter: conntrack: fix boot failure with nf_conntrack.enable_hooks=1

2021-10-13 09:41:54 +02:00

nf_dup_ipv4.c

netfilter: drop bridge nf reset from nf_reset

2019-10-01 18:42:15 +02:00

nf_flow_table_ipv4.c

netfilter: Add MODULE_DESCRIPTION entries to kernel modules

2020-06-25 00:50:31 +02:00

nf_nat_h323.c

netfilter: nf_conntrack_sip: fix expectation clash

2019-07-16 13:16:59 +02:00

nf_nat_pptp.c

netfilter: delete repeated words

2020-08-28 20:11:38 +02:00

nf_nat_snmp_basic_main.c

netfilter: ipv4: prefer skb_ensure_writable

2019-05-31 18:02:46 +02:00

nf_nat_snmp_basic.asn1

netfilter: nf_nat_snmp_basic: use asn1 decoder library

2018-01-19 13:59:07 +01:00

nf_reject_ipv4.c

netfilter: use actual socket sk for REJECT action

2020-12-01 14:33:55 +01:00

nf_socket_ipv4.c

treewide: Remove uninitialized_var() usage

2020-07-16 12:35:15 -07:00

nf_tproxy_ipv4.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-06-22 08:59:24 -04:00

nft_dup_ipv4.c

netfilter: nftables: add nft_parse_register_load() and use it

2021-01-27 22:53:29 +01:00

nft_fib_ipv4.c

netfilter: Add MODULE_DESCRIPTION entries to kernel modules

2020-06-25 00:50:31 +02:00

nft_reject_ipv4.c

netfilter: nf_tables: add and use nft_sk helper

2021-05-29 01:04:53 +02:00