From: dwilder <dwilder@us.ibm.com>
To: Florian Westphal <fw@strlen.de>
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
wilder@us.ibm.com, mkubecek@suse.com
Subject: RE: [(RFC) PATCH ] NULL pointer dereference on rmmod iptable_mangle.
Date: Wed, 03 Jun 2020 23:00:18 -0700 [thread overview]
Message-ID: <72692f32471b5d2eeef9514bb2c9ba51@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200603220502.GD28263@breakpoint.cc>
On 2020-06-03 15:05, Florian Westphal wrote:
> David Wilder <dwilder@us.ibm.com> wrote:
>> This crash happened on a ppc64le system running ltp network tests when
>> ltp script ran "rmmod iptable_mangle".
>>
>> [213425.602369] BUG: Kernel NULL pointer dereference at 0x00000010
>> [213425.602388] Faulting instruction address: 0xc008000000550bdc
> [..]
>
>> In the crash we find in iptable_mangle_hook() that
>> state->net->ipv4.iptable_mangle=NULL causing a NULL pointer
>> dereference. net->ipv4.iptable_mangle is set to NULL in
>> iptable_mangle_net_exit() and called when ip_mangle modules is
>> unloaded. A rmmod task was found in the crash dump. A 2nd crash
>> showed the same problem when running "rmmod iptable_filter"
>> (net->ipv4.iptable_filter=NULL).
>>
>> Once a hook is registered packets will picked up a pointer from:
>> net->ipv4.iptable_$table. The patch adds a call to synchronize_net()
>> in ipt_unregister_table() to insure no packets are in flight that have
>> picked up the pointer before completing the un-register.
>>
>> This change has has prevented the problem in our testing. However, we
>> have concerns with this change as it would mean that on netns cleanup,
>> we would need one synchronize_net() call for every table in use. Also,
>> on module unload, there would be one synchronize_net() for every
>> existing netns.
>
> Yes, I agree with the analysis.
>
>> Signed-off-by: David Wilder <dwilder@us.ibm.com>
>> ---
>> net/ipv4/netfilter/ip_tables.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/ipv4/netfilter/ip_tables.c
>> b/net/ipv4/netfilter/ip_tables.c
>> index c2670ea..97c4121 100644
>> --- a/net/ipv4/netfilter/ip_tables.c
>> +++ b/net/ipv4/netfilter/ip_tables.c
>> @@ -1800,8 +1800,10 @@ int ipt_register_table(struct net *net, const
>> struct xt_table *table,
>> void ipt_unregister_table(struct net *net, struct xt_table *table,
>> const struct nf_hook_ops *ops)
>> {
>> - if (ops)
>> + if (ops) {
>> nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
>> + synchronize_net();
>> + }
>
> I'd wager ebtables, arptables and ip6tables have the same bug.
>
> The extra synchronize_net() isn't ideal. We could probably do it this
> way and then improve in a second patch.
>
> One way to fix this without a new synchronize_net() is to switch all
> iptable_foo.c to use ".pre_exit" hook as well.
>
> pre_exit would unregister the underlying hook and .exit would to the
> table freeing.
>
> Since the netns core already does an unconditional synchronize_rcu
> after
> the pre_exit hooks this would avoid the problem as well.
Something like this? (un-tested)
diff --git a/net/ipv4/netfilter/iptable_mangle.c
b/net/ipv4/netfilter/iptable_mangle.c
index bb9266ea3785..0d448e4d5213 100644
--- a/net/ipv4/netfilter/iptable_mangle.c
+++ b/net/ipv4/netfilter/iptable_mangle.c
@@ -100,15 +100,26 @@ static int __net_init
iptable_mangle_table_init(struct net *net)
return ret;
}
+static void __net_exit iptable_mangle_net_pre_exit(struct net *net)
+{
+ struct xt_table *table = net->ipv4.iptable_mangle;
+
+ if (mangle_ops)
+ nf_unregister_net_hooks(net, mangle_ops,
+ hweight32(table->valid_hooks));
+}
+
+
static void __net_exit iptable_mangle_net_exit(struct net *net)
{
if (!net->ipv4.iptable_mangle)
return;
- ipt_unregister_table(net, net->ipv4.iptable_mangle, mangle_ops);
+ ipt_unregister_table(net, net->ipv4.iptable_mangle, NULL);
net->ipv4.iptable_mangle = NULL;
}
static struct pernet_operations iptable_mangle_net_ops = {
+ .pre_exit = iptable_mangle_net_pre_exit,
.exit = iptable_mangle_net_exit,
};
next prev parent reply other threads:[~2020-06-04 6:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 21:25 [(RFC) PATCH ] NULL pointer dereference on rmmod iptable_mangle David Wilder
2020-06-03 22:05 ` Florian Westphal
2020-06-04 6:00 ` dwilder [this message]
2020-06-04 10:38 ` Florian Westphal
2020-06-15 11:44 ` Florian Westphal
2020-06-15 16:21 ` dwilder
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=72692f32471b5d2eeef9514bb2c9ba51@linux.vnet.ibm.com \
--to=dwilder@us.ibm.com \
--cc=fw@strlen.de \
--cc=mkubecek@suse.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=wilder@us.ibm.com \
/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).