[PATCH v2 0/2] Fixes for netns initializations

[PATCH v2 0/2] Fixes for netns initializations

[Julian Anastasov]

	This changeset fixes problems with failed netns
initializations. Hans should provide similar fix for
LBLC and LBLCR. This is for the stable tree.

Julian Anastasov (2):
  ipvs: reset ipvs pointer in netns
  ipvs: add check in ftp for initialized core

 net/netfilter/ipvs/ip_vs_core.c |    2 ++
 net/netfilter/ipvs/ip_vs_ftp.c  |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

-- 
1.7.3.4

[PATCH v2 1/2] ipvs: reset ipvs pointer in netns

[Julian Anastasov]

	Make sure net->ipvs is reset on netns cleanup or failed
initialization. It is needed for IPVS applications to know that
IPVS core is not loaded in netns.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
 net/netfilter/ipvs/ip_vs_core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 2555816..260b9ef 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1924,6 +1924,7 @@ protocol_fail:
 control_fail:
 	ip_vs_estimator_net_cleanup(net);
 estimator_fail:
+	net->ipvs = NULL;
 	return -ENOMEM;
 }
 
@@ -1936,6 +1937,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
 	ip_vs_control_net_cleanup(net);
 	ip_vs_estimator_net_cleanup(net);
 	IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen);
+	net->ipvs = NULL;
 }
 
 static void __net_exit __ip_vs_dev_cleanup(struct net *net)
-- 
1.7.3.4

[PATCH v2 2/2] ipvs: add check in ftp for initialized core

[Julian Anastasov]

	Avoid crash when registering ip_vs_ftp after
the IPVS core initialization for netns fails. Do this by
checking for present core (net->ipvs).

Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
 net/netfilter/ipvs/ip_vs_ftp.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 538d74e..e39f693 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -439,6 +439,8 @@ static int __net_init __ip_vs_ftp_init(struct net *net)
 	struct ip_vs_app *app;
 	struct netns_ipvs *ipvs = net_ipvs(net);
 
+	if (!ipvs)
+		return -ENOENT;
 	app = kmemdup(&ip_vs_ftp, sizeof(struct ip_vs_app), GFP_KERNEL);
 	if (!app)
 		return -ENOMEM;
-- 
1.7.3.4

Re: [PATCH v2 1/2] ipvs: reset ipvs pointer in netns

[Hans Schillstrom]

Hello
On Tuesday 24 April 2012 23:29:58 Julian Anastasov wrote:
> 	Make sure net->ipvs is reset on netns cleanup or failed
> initialization. It is needed for IPVS applications to know that
> IPVS core is not loaded in netns.
> 
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> ---
>  net/netfilter/ipvs/ip_vs_core.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 2555816..260b9ef 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -1924,6 +1924,7 @@ protocol_fail:
>  control_fail:
>  	ip_vs_estimator_net_cleanup(net);
>  estimator_fail:
> +	net->ipvs = NULL;
>  	return -ENOMEM;
>  }
>  
> @@ -1936,6 +1937,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
>  	ip_vs_control_net_cleanup(net);
>  	ip_vs_estimator_net_cleanup(net);
>  	IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen);
> +	net->ipvs = NULL;
>  }
>  
>  static void __net_exit __ip_vs_dev_cleanup(struct net *net)

-- 
Regards
Hans Schillstrom <hans.schillstrom@ericsson.com>

Re: [PATCH v2 2/2] ipvs: add check in ftp for initialized core

[Hans Schillstrom]

On Tuesday 24 April 2012 23:29:59 Julian Anastasov wrote:
> 	Avoid crash when registering ip_vs_ftp after
> the IPVS core initialization for netns fails. Do this by
> checking for present core (net->ipvs).
> 
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> ---
>  net/netfilter/ipvs/ip_vs_ftp.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
> index 538d74e..e39f693 100644
> --- a/net/netfilter/ipvs/ip_vs_ftp.c
> +++ b/net/netfilter/ipvs/ip_vs_ftp.c
> @@ -439,6 +439,8 @@ static int __net_init __ip_vs_ftp_init(struct net *net)
>  	struct ip_vs_app *app;
>  	struct netns_ipvs *ipvs = net_ipvs(net);
>  
> +	if (!ipvs)
> +		return -ENOENT;
>  	app = kmemdup(&ip_vs_ftp, sizeof(struct ip_vs_app), GFP_KERNEL);
>  	if (!app)
>  		return -ENOMEM;

-- 
Regards
Hans Schillstrom <hans.schillstrom@ericsson.com>

Re: [PATCH v2 0/2] Fixes for netns initializations

[Simon Horman]

On Wed, Apr 25, 2012 at 12:29:57AM +0300, Julian Anastasov wrote:
> 	This changeset fixes problems with failed netns
> initializations. Hans should provide similar fix for
> LBLC and LBLCR. This is for the stable tree.
> 
> Julian Anastasov (2):
>   ipvs: reset ipvs pointer in netns
>   ipvs: add check in ftp for initialized core
> 
>  net/netfilter/ipvs/ip_vs_core.c |    2 ++
>  net/netfilter/ipvs/ip_vs_ftp.c  |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)

Thanks, both patches pushed to ipvs.
I plan to will wait for Hans's fixes to be finalised
before sending a pull request.

Re: [PATCH v2 0/2] Fixes for netns initializations

[Simon Horman]

On Thu, Apr 26, 2012 at 03:24:07PM +0900, Simon Horman wrote:
> On Wed, Apr 25, 2012 at 12:29:57AM +0300, Julian Anastasov wrote:
> > 	This changeset fixes problems with failed netns
> > initializations. Hans should provide similar fix for
> > LBLC and LBLCR. This is for the stable tree.
> > 
> > Julian Anastasov (2):
> >   ipvs: reset ipvs pointer in netns
> >   ipvs: add check in ftp for initialized core
> > 
> >  net/netfilter/ipvs/ip_vs_core.c |    2 ++
> >  net/netfilter/ipvs/ip_vs_ftp.c  |    2 ++
> >  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> Thanks, both patches pushed to ipvs.
> I plan to will wait for Hans's fixes to be finalised
> before sending a pull request.

Incidently, I have rebased the ipvs tree to include
the latest merged patches in Pablo's net tree.