[CRIU] [PATCH] seccomp: Don't exit from __export_restore_thread

Cyrill Gorcunov gorcunov at gmail.com
Wed May 16 11:46:59 MSK 2018


After CR_STATE_RESTORE_SIGCHLD stage triggered we are
not allowed to exit, just yield the BUG instead.

Reported-by: Andrei Vagin <avagin at virtuozzo.com>
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 criu/pie/restorer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index fbdec0bca01c..9b7f6ddbee7b 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -588,13 +588,13 @@ long __export_restore_thread(struct thread_restore_args *args)
 	 * operation bound to uid 0 in current user ns.
 	 */
 	if (restore_seccomp(args))
-		goto core_restore_end;
+		BUG();
 
 	ret = restore_creds(args->creds_args, args->ta->proc_fd);
 	ret = ret || restore_dumpable_flag(&args->ta->mm);
 	ret = ret || restore_pdeath_sig(args);
 	if (ret)
-		goto core_restore_end;
+		BUG();
 
 	restore_finish_stage(task_entries_local, CR_STATE_RESTORE_CREDS);
 
-- 
2.14.3



More information about the CRIU mailing list