* [PATCH] l2tp: fix possible oops on l2tp_eth module unload
@ 2011-03-21 9:26 James Chapman
2011-03-22 1:10 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: James Chapman @ 2011-03-21 9:26 UTC (permalink / raw)
To: netdev
A struct used in the l2tp_eth driver for registering network namespace
ops was incorrectly marked as __net_initdata, leading to oops when
module unloaded.
BUG: unable to handle kernel paging request at ffffffffa00ec098
IP: [<ffffffff8123dbd8>] ops_exit_list+0x7/0x4b
PGD 142d067 PUD 1431063 PMD 195da8067 PTE 0
Oops: 0000 [#1] SMP
last sysfs file: /sys/module/l2tp_eth/refcnt
Call Trace:
[<ffffffff8123dc94>] ? unregister_pernet_operations+0x32/0x93
[<ffffffff8123dd20>] ? unregister_pernet_device+0x2b/0x38
[<ffffffff81068b6e>] ? sys_delete_module+0x1b8/0x222
[<ffffffff810c7300>] ? do_munmap+0x254/0x318
[<ffffffff812c64e5>] ? page_fault+0x25/0x30
[<ffffffff812c6952>] ? system_call_fastpath+0x16/0x1b
Signed-off-by: James Chapman <jchapman@katalix.com>
---
Push to stable trees too?
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 8d9ce0a..a8193f5 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -283,7 +283,7 @@ static __net_init int l2tp_eth_init_net(struct net *net)
return 0;
}
-static __net_initdata struct pernet_operations l2tp_eth_net_ops = {
+static struct pernet_operations l2tp_eth_net_ops = {
.init = l2tp_eth_init_net,
.id = &l2tp_eth_net_id,
.size = sizeof(struct l2tp_eth_net),
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] l2tp: fix possible oops on l2tp_eth module unload
2011-03-21 9:26 [PATCH] l2tp: fix possible oops on l2tp_eth module unload James Chapman
@ 2011-03-22 1:10 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-03-22 1:10 UTC (permalink / raw)
To: jchapman; +Cc: netdev
From: James Chapman <jchapman@katalix.com>
Date: Mon, 21 Mar 2011 09:26:26 GMT
> A struct used in the l2tp_eth driver for registering network namespace
> ops was incorrectly marked as __net_initdata, leading to oops when
> module unloaded.
...
> Signed-off-by: James Chapman <jchapman@katalix.com>
Applied, thanks James.
> Push to stable trees too?
Yep I'll take care of that.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-22 1:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-21 9:26 [PATCH] l2tp: fix possible oops on l2tp_eth module unload James Chapman
2011-03-22 1:10 ` David Miller
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).