]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
attach: move check for valid config earlier
authorChristian Brauner <christian.brauner@ubuntu.com>
Wed, 15 Apr 2020 12:06:29 +0000 (14:06 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Wed, 15 Apr 2020 12:10:31 +0000 (14:10 +0200)
Fixes: Coverity 1461735.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/attach.c

index 406b8ec74058ecc63bcac1fe524750a57fb5cc61..bbf95bd5b6f072b32888e9ab6f21b2a048875b63 100644 (file)
@@ -1018,6 +1018,8 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
                }
        }
        conf = init_ctx->container->lxc_conf;
+       if (!conf)
+               return log_error_errno(-EINVAL, EINVAL, "Missing container confifg");
 
        if (!fetch_seccomp(init_ctx->container, options))
                WARN("Failed to get seccomp policy");
@@ -1275,7 +1277,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
                        TRACE("Sent LSM label file descriptor %d to child", labelfd);
                }
 
-               if (conf && conf->seccomp.seccomp) {
+               if (conf->seccomp.seccomp) {
                        ret = lxc_seccomp_recv_notifier_fd(&conf->seccomp, ipc_sockets[0]);
                        if (ret < 0)
                                goto close_mainloop;