[PATCH 1/1] restore_ipc_ns: set ret=0 if no error

[PATCH 1/1] restore_ipc_ns: set ret=0 if no error

[Serge E. Hallyn]

Why pretend there's an error when there isn't?

(Without this, all restarts fail with CONFIG_UTS_NS or CONFIG_IPC_NS
on)

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 kernel/nsproxy.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index e3db0b9..5fae13c 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -308,6 +308,7 @@ static struct nsproxy *do_restore_ns(struct ckpt_ctx *ctx)
 	nsproxy = create_nsproxy();
 	if (!nsproxy)
 		goto out;
+	ret = 0;
 
 	get_uts_ns(uts_ns);
 	nsproxy->uts_ns = uts_ns;
-- 
1.6.1

Re: [PATCH 1/1] restore_ipc_ns: set ret=0 if no error

[Oren Laadan]

Heh .. I already hit this one and fixed - I am finishing a few more
fixes before pushing them all.

Thanks :)

Serge E. Hallyn wrote:
> Why pretend there's an error when there isn't?
> 
> (Without this, all restarts fail with CONFIG_UTS_NS or CONFIG_IPC_NS
> on)
> 
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  kernel/nsproxy.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
> index e3db0b9..5fae13c 100644
> --- a/kernel/nsproxy.c
> +++ b/kernel/nsproxy.c
> @@ -308,6 +308,7 @@ static struct nsproxy *do_restore_ns(struct ckpt_ctx *ctx)
>  	nsproxy = create_nsproxy();
>  	if (!nsproxy)
>  		goto out;
> +	ret = 0;
>  
>  	get_uts_ns(uts_ns);
>  	nsproxy->uts_ns = uts_ns;