restore: don't forget to update creds after rst_mem_remap_ptr()

rst_mem_alloc() can moves a vma with previous objects, so if we want to access them, we have to update their pointers https://github.com/xemul/criu/issues/304 Cc: Kirill Tkhai <[email protected]> Fixes: 72e295e ("ns: Convert task cred's xids to target user ns") Signed-off-by: Andrei Vagin <[email protected]> Reviewed-by: Kirill Tkhai <[email protected]> Signed-off-by: Andrei Vagin <[email protected]>
avagin · Apr 4, 2017 · f2af34d · f2af34d
1 parent 05e10c6
commit f2af34d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
@@ -2824,6 +2824,7 @@ rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 
 			args = rst_mem_remap_ptr(this_pos, RM_PRIVATE);
 			args->lsm_profile = lsm_profile;
+			creds = &args->creds;
 			strncpy(args->lsm_profile, rendered, lsm_profile_len);
 			xfree(rendered);
 		}
@@ -2855,6 +2856,7 @@ rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 		if (!groups)
 			return ERR_PTR(-ENOMEM);
 		args = rst_mem_remap_ptr(this_pos, RM_PRIVATE);
+		creds = &args->creds;
 		args->groups = groups;
 		memcpy(args->groups, ce->groups, ce->n_groups * sizeof(u32));
 	} else {