[CRIU] [PATCH 02/11] restore: fix sys_wait4 error handling in case no child

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Fri May 26 10:02:45 PDT 2017


Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 criu/pie/restorer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 736c125..9b553a0 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1104,7 +1104,7 @@ static int wait_helpers(struct task_restore_args *task_args)
 		pid_t pid = task_args->helpers[i];
 
 		/* Check that a helper completed. */
-		if (sys_wait4(pid, &status, 0, NULL) == -1) {
+		if (sys_wait4(pid, &status, 0, NULL) == -ECHILD) {
 			/* It has been waited in sigchld_handler */
 			continue;
 		}
-- 
2.9.3



More information about the CRIU mailing list