[GIT PULL nf-2.6] IPVS

[GIT PULL nf-2.6] IPVS

[Simon Horman]

Hi Pablo, Hi Patrick,

please consider pulling

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6.git master

to get the following crash on module removal fix for IPVS.

Sorry for sending this so very, very late in the release cycle.
I had sent it earlier but it seems to have slipped through the cracks
somehow.

Simon Horman (1):
      IPVS: Free resources on module removal

 net/netfilter/ipvs/ip_vs_ctl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

[PATCH] IPVS: Free resources on module removal

[Simon Horman]

This resolves a panic on module removal.

Reported-by: Dave Jones <davej@redhat.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_ctl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 699c79a..a178cb3 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3771,6 +3771,7 @@ err_sock:
 void ip_vs_control_cleanup(void)
 {
 	EnterFunction(2);
+	unregister_netdevice_notifier(&ip_vs_dst_notifier);
 	ip_vs_genl_unregister();
 	nf_unregister_sockopt(&ip_vs_sockopts);
 	LeaveFunction(2);
-- 
1.7.5.4

Re: [GIT PULL nf-2.6] IPVS

[Simon Horman]

On Fri, Jul 22, 2011 at 09:18:39AM +0900, Simon Horman wrote:
> Hi Pablo, Hi Patrick,
> 
> please consider pulling
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6.git master
> 
> to get the following crash on module removal fix for IPVS.
> 
> Sorry for sending this so very, very late in the release cycle.
> I had sent it earlier but it seems to have slipped through the cracks
> somehow.
> 
> Simon Horman (1):
>       IPVS: Free resources on module removal
> 
>  net/netfilter/ipvs/ip_vs_ctl.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Ping.

What is the best way forward to get this both in 3.1 and 3.0 -stable?

Re: [GIT PULL nf-2.6] IPVS

[David Miller]

From: Simon Horman <horms@verge.net.au>
Date: Fri, 29 Jul 2011 09:12:06 +0900

> What is the best way forward to get this both in 3.1 and 3.0 -stable?

I'll take this directly and do the -stable submission too.

Re: [GIT PULL nf-2.6] IPVS

[Patrick McHardy]

On 29.07.2011 03:39, David Miller wrote:
> From: Simon Horman <horms@verge.net.au>
> Date: Fri, 29 Jul 2011 09:12:06 +0900
> 
>> What is the best way forward to get this both in 3.1 and 3.0 -stable?
> 
> I'll take this directly and do the -stable submission too.
> 

Sorry, I seem to have missed this, also can't find the email in my
inbox for some reason. Anyways, generally please do the stable
submissions for IPVS yourself (after the patch went upstream of
course).

[GIT PULL nf-2.6] IPVS

[Simon Horman]

Hi Pablo, Hi Patrick,

please consider pulling

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6.git master

to get the following fix for IPVS.

I have based my tree on net-2.6 as it contains all of the IPVS patches -
currently some are in Patrick's tree and one of them is in Pablo's tree but
all of them are in Dave's tree.

Please feel free to apply the patch manually if that suits you better.

Simon Horman (1):
      IPVS: Free resources on module removal

 net/netfilter/ipvs/ip_vs_ctl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

[PATCH] IPVS: Free resources on module removal

[Simon Horman]

Reported-by: Dave Jones <davej@redhat.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_ctl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 37890f2..9b9039b 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3774,6 +3774,7 @@ err_sock:
 void ip_vs_control_cleanup(void)
 {
 	EnterFunction(2);
+	unregister_netdevice_notifier(&ip_vs_dst_notifier);
 	ip_vs_genl_unregister();
 	nf_unregister_sockopt(&ip_vs_sockopts);
 	LeaveFunction(2);
-- 
1.7.4.4