Merge pull request #2030 from brauner/2017-12-13/fix_cgroup_namsepace_recording

[mirror_lxc.git] / src / lxc / criu.c

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index bb136d4cb176452d0c4bb03f2ec641eed246c196..3e9b4ebb7635dcfdfa3f40a33d87360fed0175d8 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -829,7 +829,7 @@ out_unlock:
  */
 static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_opts *opts, char *criu_version)
 {
-       int fd;
+       int fd, ret;
        pid_t pid;
        struct lxc_handler *handler;
        int status = 0;
@@ -870,7 +870,11 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
                goto out_fini_handler;
        }
 
-       resolve_clone_flags(handler);
+       ret = resolve_clone_flags(handler);
+       if (ret < 0) {
+               ERROR("%s - Unsupported clone flag specified", strerror(errno));
+               goto out_fini_handler;
+       }
 
        if (pipe(pipes) < 0) {
                SYSERROR("pipe() failed");