* [GIT PULL net] IPVS (v2)
@ 2012-04-23 13:12 Simon Horman
2012-04-23 13:12 ` [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered Simon Horman
2012-04-23 13:12 ` [PATCH 2/2] ipvs: fix crash in ip_vs_control_net_cleanup on unload Simon Horman
0 siblings, 2 replies; 6+ messages in thread
From: Simon Horman @ 2012-04-23 13:12 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Sasha Levin
sorry for the miss-fire a little earlier. Please consider the following two
changes for 3.4. The patch from Julian reolves a crash on module unload.
And the patch from Sasha resolves a crash on initialisation.
The following changes since commit 6ba900676bec8baaf61aa2f85b7345c0e65774d9:
netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net (2012-04-10 13:00:38 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git master
for you to fetch changes up to 0cc4789846744470e50707cbc7f0fbb543e6f2a3:
ipvs: fix crash in ip_vs_control_net_cleanup on unload (2012-04-23 21:45:50 +0900)
----------------------------------------------------------------
Julian Anastasov (1):
ipvs: fix crash in ip_vs_control_net_cleanup on unload
Sasha Levin (1):
netfilter: ipvs: Verify that IP_VS protocol has been registered
net/netfilter/ipvs/ip_vs_ctl.c | 4 ++--
net/netfilter/ipvs/ip_vs_proto.c | 27 ++++++++++++++++++---------
2 files changed, 20 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered 2012-04-23 13:12 [GIT PULL net] IPVS (v2) Simon Horman @ 2012-04-23 13:12 ` Simon Horman 2012-04-25 9:14 ` Pablo Neira Ayuso 2012-04-23 13:12 ` [PATCH 2/2] ipvs: fix crash in ip_vs_control_net_cleanup on unload Simon Horman 1 sibling, 1 reply; 6+ messages in thread From: Simon Horman @ 2012-04-23 13:12 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov, Sasha Levin, stable, Simon Horman From: Sasha Levin <levinsasha928@gmail.com> The registration of a protocol might fail, there were no checks and all registrations were assumed to be correct. This lead to NULL ptr dereferences when apps tried registering. For example: [ 1293.226051] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 [ 1293.227038] IP: [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 [ 1293.227038] PGD 391de067 PUD 6c20b067 PMD 0 [ 1293.227038] Oops: 0000 [#1] PREEMPT SMP [ 1293.227038] CPU 1 [ 1293.227038] Pid: 19609, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57 [ 1293.227038] RIP: 0010:[<ffffffff822aacb0>] [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 [ 1293.227038] RSP: 0018:ffff880038c1dd18 EFLAGS: 00010286 [ 1293.227038] RAX: ffffffffffffffc0 RBX: 0000000000001500 RCX: 0000000000010000 [ 1293.227038] RDX: 0000000000000000 RSI: ffff88003a2d5888 RDI: 0000000000000282 [ 1293.227038] RBP: ffff880038c1dd48 R08: 0000000000000000 R09: 0000000000000000 [ 1293.227038] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a2d5668 [ 1293.227038] R13: ffff88003a2d5988 R14: ffff8800696a8ff8 R15: 0000000000000000 [ 1293.227038] FS: 00007f01930d9700(0000) GS:ffff88007ce00000(0000) knlGS:0000000000000000 [ 1293.227038] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 1293.227038] CR2: 0000000000000018 CR3: 0000000065dfc000 CR4: 00000000000406e0 [ 1293.227038] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1293.227038] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 1293.227038] Process trinity (pid: 19609, threadinfo ffff880038c1c000, task ffff88002dc73000) [ 1293.227038] Stack: [ 1293.227038] ffff880038c1dd48 00000000fffffff4 ffff8800696aada0 ffff8800694f5580 [ 1293.227038] ffffffff8369f1e0 0000000000001500 ffff880038c1dd98 ffffffff822a716b [ 1293.227038] 0000000000000000 ffff8800696a8ff8 0000000000000015 ffff8800694f5580 [ 1293.227038] Call Trace: [ 1293.227038] [<ffffffff822a716b>] ip_vs_app_inc_new+0xdb/0x180 [ 1293.227038] [<ffffffff822a7258>] register_ip_vs_app_inc+0x48/0x70 [ 1293.227038] [<ffffffff822b2fea>] __ip_vs_ftp_init+0xba/0x140 [ 1293.227038] [<ffffffff821c9060>] ops_init+0x80/0x90 [ 1293.227038] [<ffffffff821c90cb>] setup_net+0x5b/0xe0 [ 1293.227038] [<ffffffff821c9416>] copy_net_ns+0x76/0x100 [ 1293.227038] [<ffffffff810dc92b>] create_new_namespaces+0xfb/0x190 [ 1293.227038] [<ffffffff810dca21>] unshare_nsproxy_namespaces+0x61/0x80 [ 1293.227038] [<ffffffff810afd1f>] sys_unshare+0xff/0x290 [ 1293.227038] [<ffffffff8187622e>] ? trace_hardirqs_on_thunk+0x3a/0x3f [ 1293.227038] [<ffffffff82665539>] system_call_fastpath+0x16/0x1b [ 1293.227038] Code: 89 c7 e8 34 91 3b 00 89 de 66 c1 ee 04 31 de 83 e6 0f 48 83 c6 22 48 c1 e6 04 4a 8b 14 26 49 8d 34 34 48 8d 42 c0 48 39 d6 74 13 <66> 39 58 58 74 22 48 8b 48 40 48 8d 41 c0 48 39 ce 75 ed 49 8d [ 1293.227038] RIP [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 [ 1293.227038] RSP <ffff880038c1dd18> [ 1293.227038] CR2: 0000000000000018 [ 1293.379284] ---[ end trace 364ab40c7011a009 ]--- [ 1293.381182] Kernel panic - not syncing: Fatal exception in interrupt Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <levinsasha928@gmail.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au> --- net/netfilter/ipvs/ip_vs_proto.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index f843a88..a62360e 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -59,9 +59,6 @@ static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp) return 0; } -#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP) || \ - defined(CONFIG_IP_VS_PROTO_SCTP) || defined(CONFIG_IP_VS_PROTO_AH) || \ - defined(CONFIG_IP_VS_PROTO_ESP) /* * register an ipvs protocols netns related data */ @@ -86,7 +83,6 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp) return 0; } -#endif /* * unregister an ipvs protocol @@ -316,22 +312,35 @@ ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp, */ int __net_init ip_vs_protocol_net_init(struct net *net) { + int i, ret; + static struct ip_vs_protocol *protos[] = { #ifdef CONFIG_IP_VS_PROTO_TCP - register_ip_vs_proto_netns(net, &ip_vs_protocol_tcp); + &ip_vs_protocol_tcp, #endif #ifdef CONFIG_IP_VS_PROTO_UDP - register_ip_vs_proto_netns(net, &ip_vs_protocol_udp); + &ip_vs_protocol_udp, #endif #ifdef CONFIG_IP_VS_PROTO_SCTP - register_ip_vs_proto_netns(net, &ip_vs_protocol_sctp); + &ip_vs_protocol_sctp, #endif #ifdef CONFIG_IP_VS_PROTO_AH - register_ip_vs_proto_netns(net, &ip_vs_protocol_ah); + &ip_vs_protocol_ah, #endif #ifdef CONFIG_IP_VS_PROTO_ESP - register_ip_vs_proto_netns(net, &ip_vs_protocol_esp); + &ip_vs_protocol_esp, #endif + }; + + for (i = 0; i < ARRAY_SIZE(protos); i++) { + ret = register_ip_vs_proto_netns(net, protos[i]); + if (ret < 0) + goto cleanup; + } return 0; + +cleanup: + ip_vs_protocol_net_cleanup(net); + return ret; } void __net_exit ip_vs_protocol_net_cleanup(struct net *net) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered 2012-04-23 13:12 ` [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered Simon Horman @ 2012-04-25 9:14 ` Pablo Neira Ayuso 2012-04-26 6:15 ` Simon Horman 0 siblings, 1 reply; 6+ messages in thread From: Pablo Neira Ayuso @ 2012-04-25 9:14 UTC (permalink / raw) To: Simon Horman Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov, Sasha Levin On Mon, Apr 23, 2012 at 10:12:11PM +0900, Simon Horman wrote: > From: Sasha Levin <levinsasha928@gmail.com> > > The registration of a protocol might fail, there were no checks > and all registrations were assumed to be correct. This lead to > NULL ptr dereferences when apps tried registering. > > For example: > > [ 1293.226051] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 > [ 1293.227038] IP: [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 > [ 1293.227038] PGD 391de067 PUD 6c20b067 PMD 0 > [ 1293.227038] Oops: 0000 [#1] PREEMPT SMP > [ 1293.227038] CPU 1 > [ 1293.227038] Pid: 19609, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57 > [ 1293.227038] RIP: 0010:[<ffffffff822aacb0>] [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 > [ 1293.227038] RSP: 0018:ffff880038c1dd18 EFLAGS: 00010286 > [ 1293.227038] RAX: ffffffffffffffc0 RBX: 0000000000001500 RCX: 0000000000010000 > [ 1293.227038] RDX: 0000000000000000 RSI: ffff88003a2d5888 RDI: 0000000000000282 > [ 1293.227038] RBP: ffff880038c1dd48 R08: 0000000000000000 R09: 0000000000000000 > [ 1293.227038] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a2d5668 > [ 1293.227038] R13: ffff88003a2d5988 R14: ffff8800696a8ff8 R15: 0000000000000000 > [ 1293.227038] FS: 00007f01930d9700(0000) GS:ffff88007ce00000(0000) knlGS:0000000000000000 > [ 1293.227038] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b > [ 1293.227038] CR2: 0000000000000018 CR3: 0000000065dfc000 CR4: 00000000000406e0 > [ 1293.227038] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > [ 1293.227038] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 > [ 1293.227038] Process trinity (pid: 19609, threadinfo ffff880038c1c000, task ffff88002dc73000) > [ 1293.227038] Stack: > [ 1293.227038] ffff880038c1dd48 00000000fffffff4 ffff8800696aada0 ffff8800694f5580 > [ 1293.227038] ffffffff8369f1e0 0000000000001500 ffff880038c1dd98 ffffffff822a716b > [ 1293.227038] 0000000000000000 ffff8800696a8ff8 0000000000000015 ffff8800694f5580 > [ 1293.227038] Call Trace: > [ 1293.227038] [<ffffffff822a716b>] ip_vs_app_inc_new+0xdb/0x180 > [ 1293.227038] [<ffffffff822a7258>] register_ip_vs_app_inc+0x48/0x70 > [ 1293.227038] [<ffffffff822b2fea>] __ip_vs_ftp_init+0xba/0x140 > [ 1293.227038] [<ffffffff821c9060>] ops_init+0x80/0x90 > [ 1293.227038] [<ffffffff821c90cb>] setup_net+0x5b/0xe0 > [ 1293.227038] [<ffffffff821c9416>] copy_net_ns+0x76/0x100 > [ 1293.227038] [<ffffffff810dc92b>] create_new_namespaces+0xfb/0x190 > [ 1293.227038] [<ffffffff810dca21>] unshare_nsproxy_namespaces+0x61/0x80 > [ 1293.227038] [<ffffffff810afd1f>] sys_unshare+0xff/0x290 > [ 1293.227038] [<ffffffff8187622e>] ? trace_hardirqs_on_thunk+0x3a/0x3f > [ 1293.227038] [<ffffffff82665539>] system_call_fastpath+0x16/0x1b > [ 1293.227038] Code: 89 c7 e8 34 91 3b 00 89 de 66 c1 ee 04 31 de 83 e6 0f 48 83 c6 22 48 c1 e6 04 4a 8b 14 26 49 8d 34 34 48 8d 42 c0 48 39 d6 74 13 <66> 39 58 58 74 22 48 8b 48 40 48 8d 41 c0 48 39 ce 75 ed 49 8d > [ 1293.227038] RIP [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 > [ 1293.227038] RSP <ffff880038c1dd18> > [ 1293.227038] CR2: 0000000000000018 > [ 1293.379284] ---[ end trace 364ab40c7011a009 ]--- > [ 1293.381182] Kernel panic - not syncing: Fatal exception in interrupt > > Cc: stable@vger.kernel.org I've removed this above from the patch. I prefer not to add confusing information (this means you'll have to rebase, sorry). > Signed-off-by: Sasha Levin <levinsasha928@gmail.com> > Acked-by: Julian Anastasov <ja@ssi.bg> > Signed-off-by: Simon Horman <horms@verge.net.au> Applied. Thanks. BTW, did you consider using an array for ipvs->ip_vs_proto_table? I think a hash table for only 5 protocols is overkill. I know, we'll consume more memory but lookups will definitely be faster, but it will consume a bit more memory (the space-time tradeoff again). ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered 2012-04-25 9:14 ` Pablo Neira Ayuso @ 2012-04-26 6:15 ` Simon Horman 0 siblings, 0 replies; 6+ messages in thread From: Simon Horman @ 2012-04-26 6:15 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov, Sasha Levin On Wed, Apr 25, 2012 at 11:14:22AM +0200, Pablo Neira Ayuso wrote: > On Mon, Apr 23, 2012 at 10:12:11PM +0900, Simon Horman wrote: > > From: Sasha Levin <levinsasha928@gmail.com> > > > > The registration of a protocol might fail, there were no checks > > and all registrations were assumed to be correct. This lead to > > NULL ptr dereferences when apps tried registering. > > > > For example: > > > > [ 1293.226051] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 > > [ 1293.227038] IP: [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 > > [ 1293.227038] PGD 391de067 PUD 6c20b067 PMD 0 > > [ 1293.227038] Oops: 0000 [#1] PREEMPT SMP > > [ 1293.227038] CPU 1 > > [ 1293.227038] Pid: 19609, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57 > > [ 1293.227038] RIP: 0010:[<ffffffff822aacb0>] [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 > > [ 1293.227038] RSP: 0018:ffff880038c1dd18 EFLAGS: 00010286 > > [ 1293.227038] RAX: ffffffffffffffc0 RBX: 0000000000001500 RCX: 0000000000010000 > > [ 1293.227038] RDX: 0000000000000000 RSI: ffff88003a2d5888 RDI: 0000000000000282 > > [ 1293.227038] RBP: ffff880038c1dd48 R08: 0000000000000000 R09: 0000000000000000 > > [ 1293.227038] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a2d5668 > > [ 1293.227038] R13: ffff88003a2d5988 R14: ffff8800696a8ff8 R15: 0000000000000000 > > [ 1293.227038] FS: 00007f01930d9700(0000) GS:ffff88007ce00000(0000) knlGS:0000000000000000 > > [ 1293.227038] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b > > [ 1293.227038] CR2: 0000000000000018 CR3: 0000000065dfc000 CR4: 00000000000406e0 > > [ 1293.227038] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > > [ 1293.227038] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 > > [ 1293.227038] Process trinity (pid: 19609, threadinfo ffff880038c1c000, task ffff88002dc73000) > > [ 1293.227038] Stack: > > [ 1293.227038] ffff880038c1dd48 00000000fffffff4 ffff8800696aada0 ffff8800694f5580 > > [ 1293.227038] ffffffff8369f1e0 0000000000001500 ffff880038c1dd98 ffffffff822a716b > > [ 1293.227038] 0000000000000000 ffff8800696a8ff8 0000000000000015 ffff8800694f5580 > > [ 1293.227038] Call Trace: > > [ 1293.227038] [<ffffffff822a716b>] ip_vs_app_inc_new+0xdb/0x180 > > [ 1293.227038] [<ffffffff822a7258>] register_ip_vs_app_inc+0x48/0x70 > > [ 1293.227038] [<ffffffff822b2fea>] __ip_vs_ftp_init+0xba/0x140 > > [ 1293.227038] [<ffffffff821c9060>] ops_init+0x80/0x90 > > [ 1293.227038] [<ffffffff821c90cb>] setup_net+0x5b/0xe0 > > [ 1293.227038] [<ffffffff821c9416>] copy_net_ns+0x76/0x100 > > [ 1293.227038] [<ffffffff810dc92b>] create_new_namespaces+0xfb/0x190 > > [ 1293.227038] [<ffffffff810dca21>] unshare_nsproxy_namespaces+0x61/0x80 > > [ 1293.227038] [<ffffffff810afd1f>] sys_unshare+0xff/0x290 > > [ 1293.227038] [<ffffffff8187622e>] ? trace_hardirqs_on_thunk+0x3a/0x3f > > [ 1293.227038] [<ffffffff82665539>] system_call_fastpath+0x16/0x1b > > [ 1293.227038] Code: 89 c7 e8 34 91 3b 00 89 de 66 c1 ee 04 31 de 83 e6 0f 48 83 c6 22 48 c1 e6 04 4a 8b 14 26 49 8d 34 34 48 8d 42 c0 48 39 d6 74 13 <66> 39 58 58 74 22 48 8b 48 40 48 8d 41 c0 48 39 ce 75 ed 49 8d > > [ 1293.227038] RIP [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0 > > [ 1293.227038] RSP <ffff880038c1dd18> > > [ 1293.227038] CR2: 0000000000000018 > > [ 1293.379284] ---[ end trace 364ab40c7011a009 ]--- > > [ 1293.381182] Kernel panic - not syncing: Fatal exception in interrupt > > > > Cc: stable@vger.kernel.org > > I've removed this above from the patch. I prefer not to add confusing > information (this means you'll have to rebase, sorry). Understood. > > Signed-off-by: Sasha Levin <levinsasha928@gmail.com> > > Acked-by: Julian Anastasov <ja@ssi.bg> > > Signed-off-by: Simon Horman <horms@verge.net.au> > > Applied. Thanks. Thanks. > BTW, did you consider using an array for ipvs->ip_vs_proto_table? > > I think a hash table for only 5 protocols is overkill. I know, we'll > consume more memory but lookups will definitely be faster, but it will > consume a bit more memory (the space-time tradeoff again). That sounds reasonable to me. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ipvs: fix crash in ip_vs_control_net_cleanup on unload 2012-04-23 13:12 [GIT PULL net] IPVS (v2) Simon Horman 2012-04-23 13:12 ` [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered Simon Horman @ 2012-04-23 13:12 ` Simon Horman 2012-04-25 9:15 ` Pablo Neira Ayuso 1 sibling, 1 reply; 6+ messages in thread From: Simon Horman @ 2012-04-23 13:12 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov, Sasha Levin, stable, Hans Schillstrom, Simon Horman From: Julian Anastasov <ja@ssi.bg> commit 14e405461e664b777e2a5636e10b2ebf36a686ec (2.6.39) ("Add __ip_vs_control_{init,cleanup}_sysctl()") introduced regression due to wrong __net_init for __ip_vs_control_cleanup_sysctl. This leads to crash when the ip_vs module is unloaded. Fix it by changing __net_init to __net_exit for the function that is already renamed to ip_vs_control_net_cleanup_sysctl. Cc: stable@vger.kernel.org Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Hans Schillstrom <hans@schillstrom.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index b3afe18..376d2b1 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3680,7 +3680,7 @@ int __net_init ip_vs_control_net_init_sysctl(struct net *net) return 0; } -void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) +void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) { struct netns_ipvs *ipvs = net_ipvs(net); @@ -3692,7 +3692,7 @@ void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) #else int __net_init ip_vs_control_net_init_sysctl(struct net *net) { return 0; } -void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) { } +void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) { } #endif -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ipvs: fix crash in ip_vs_control_net_cleanup on unload 2012-04-23 13:12 ` [PATCH 2/2] ipvs: fix crash in ip_vs_control_net_cleanup on unload Simon Horman @ 2012-04-25 9:15 ` Pablo Neira Ayuso 0 siblings, 0 replies; 6+ messages in thread From: Pablo Neira Ayuso @ 2012-04-25 9:15 UTC (permalink / raw) To: Simon Horman Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov, Sasha Levin, stable, Hans Schillstrom On Mon, Apr 23, 2012 at 10:12:12PM +0900, Simon Horman wrote: > From: Julian Anastasov <ja@ssi.bg> > > commit 14e405461e664b777e2a5636e10b2ebf36a686ec (2.6.39) > ("Add __ip_vs_control_{init,cleanup}_sysctl()") > introduced regression due to wrong __net_init for > __ip_vs_control_cleanup_sysctl. This leads to crash when > the ip_vs module is unloaded. > > Fix it by changing __net_init to __net_exit for > the function that is already renamed to ip_vs_control_net_cleanup_sysctl. > > Cc: stable@vger.kernel.org Removed this above. > Signed-off-by: Julian Anastasov <ja@ssi.bg> > Signed-off-by: Hans Schillstrom <hans@schillstrom.com> > Signed-off-by: Simon Horman <horms@verge.net.au> And applied, thanks Simon. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-26 6:15 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-04-23 13:12 [GIT PULL net] IPVS (v2) Simon Horman 2012-04-23 13:12 ` [PATCH 1/2] netfilter: ipvs: Verify that IP_VS protocol has been registered Simon Horman 2012-04-25 9:14 ` Pablo Neira Ayuso 2012-04-26 6:15 ` Simon Horman 2012-04-23 13:12 ` [PATCH 2/2] ipvs: fix crash in ip_vs_control_net_cleanup on unload Simon Horman 2012-04-25 9:15 ` Pablo Neira Ayuso
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).