[PATCH 1/1] cr: nsproxy: fix refcounting

[PATCH 1/1] cr: nsproxy: fix refcounting

[Serge E. Hallyn]

[This is the fix for the bug I was trying to nail down earlier today]

If more than one restarted task are to share a checkpointed nsproxy,
then we must inc the count on the nsproxy for each new task, as
switch_task_namespaces() does not do that for us.

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

diff --git a/checkpoint/process.c b/checkpoint/process.c
index fa166cd..52d2a9c 100644
--- a/checkpoint/process.c
+++ b/checkpoint/process.c
@@ -603,8 +603,10 @@ static int restore_ns_obj(struct ckpt_ctx *ctx, int ns_objref)
 	if (IS_ERR(nsproxy))
 		return PTR_ERR(nsproxy);
 
-	if (nsproxy != task_nsproxy(current))
+	if (nsproxy != task_nsproxy(current)) {
+		get_nsproxy(nsproxy);
 		switch_task_namespaces(current, nsproxy);
+	}
 
 	return 0;
 }
-- 
1.6.1

Re: [PATCH 1/1] cr: nsproxy: fix refcounting

[Oren Laadan]

thanks, applied.

Serge E. Hallyn wrote:
> [This is the fix for the bug I was trying to nail down earlier today]
> 
> If more than one restarted task are to share a checkpointed nsproxy,
> then we must inc the count on the nsproxy for each new task, as
> switch_task_namespaces() does not do that for us.
> 
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  checkpoint/process.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/checkpoint/process.c b/checkpoint/process.c
> index fa166cd..52d2a9c 100644
> --- a/checkpoint/process.c
> +++ b/checkpoint/process.c
> @@ -603,8 +603,10 @@ static int restore_ns_obj(struct ckpt_ctx *ctx, int ns_objref)
>  	if (IS_ERR(nsproxy))
>  		return PTR_ERR(nsproxy);
>  
> -	if (nsproxy != task_nsproxy(current))
> +	if (nsproxy != task_nsproxy(current)) {
> +		get_nsproxy(nsproxy);
>  		switch_task_namespaces(current, nsproxy);
> +	}
>  
>  	return 0;
>  }