From b1680c2c7ad0d0a92a3e2fd8cdc0e153de1b63c2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 3 Apr 2011 13:20:41 +0000 Subject: [PATCH] kernel: l2tp: fix possible oops on l2tp_eth module unload SVN-Revision: 26440 --- .../160-l2tp_fix_oops_backport.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 target/linux/generic/patches-2.6.38/160-l2tp_fix_oops_backport.patch diff --git a/target/linux/generic/patches-2.6.38/160-l2tp_fix_oops_backport.patch b/target/linux/generic/patches-2.6.38/160-l2tp_fix_oops_backport.patch new file mode 100644 index 0000000000..d8b7b5ad3d --- /dev/null +++ b/target/linux/generic/patches-2.6.38/160-l2tp_fix_oops_backport.patch @@ -0,0 +1,37 @@ +commit 8aa525a9340da4227797a06221ca08399006635f +Author: James Chapman +Date: Mon Mar 21 18:10:25 2011 -0700 + + l2tp: fix possible oops on l2tp_eth module unload + + 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: [] 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: + [] ? unregister_pernet_operations+0x32/0x93 + [] ? unregister_pernet_device+0x2b/0x38 + [] ? sys_delete_module+0x1b8/0x222 + [] ? do_munmap+0x254/0x318 + [] ? page_fault+0x25/0x30 + [] ? system_call_fastpath+0x16/0x1b + + Signed-off-by: James Chapman + Signed-off-by: David S. Miller + +--- a/net/l2tp/l2tp_eth.c ++++ b/net/l2tp/l2tp_eth.c +@@ -283,7 +283,7 @@ static __net_init int l2tp_eth_init_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), -- 2.30.2