From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 28 Oct 2020 02:58:54 +0000 (+0100)
Subject: commands: don't deref after NULL check
X-Git-Tag: lxc-5.0.0~344^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0befee9475aa7d6913ee0da24761d66b111797;p=thirdparty%2Flxc.git

commands: don't deref after NULL check

Fixes: Coverity 1465657
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index de09c3aff..cca09a126 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -487,9 +487,12 @@ static int lxc_cmd_get_devpts_fd_callback(int fd, struct lxc_cmd_req *req,
 	};
 	int ret;
 
-	if (!handler->conf || handler->conf->devpts_fd < 0)
+	if (!handler->conf || handler->conf->devpts_fd < 0) {
 		rsp.ret = -EBADF;
-	ret = lxc_abstract_unix_send_fds(fd, &handler->conf->devpts_fd, 1, &rsp, sizeof(rsp));
+		ret = lxc_abstract_unix_send_fds(fd, NULL, 0, &rsp, sizeof(rsp));
+	} else {
+		ret = lxc_abstract_unix_send_fds(fd, &handler->conf->devpts_fd, 1, &rsp, sizeof(rsp));
+	}
 	if (ret < 0)
 		return log_error(LXC_CMD_REAP_CLIENT_FD, "Failed to send devpts fd");