[lxc-devel] [lxc/master] commands_utils: fix lxc-wait

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 463 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20201118/8e21a461/attachment.bin>
-------------- next part --------------
From d2bab66fa9f5ce742bd1729f4710b2a06726bdd6 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 18 Nov 2020 21:06:37 +0100
Subject: [PATCH] commands_utils: fix lxc-wait

Closes: #3570
Fixes: 7792a5b60f79 ("commands: add additional check to lxc_cmd_sock_get_state()")
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/commands_utils.c | 2 +-
 src/lxc/state.c          | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index 2af722ca12..cba8e9c10d 100644
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -62,7 +62,7 @@ int lxc_cmd_sock_get_state(const char *name, const char *lxcpath,
 
 	ret = lxc_cmd_add_state_client(name, lxcpath, states, &state_client_fd);
 	if (ret < 0)
-		return ret_errno(EINVAL);
+		return -errno;
 
 	if (ret < MAX_STATE)
 		return ret;
diff --git a/src/lxc/state.c b/src/lxc/state.c
index 28ab60c4b9..d131e2ebeb 100644
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -100,10 +100,8 @@ int lxc_wait(const char *lxcname, const char *states, int timeout,
 		if (state >= 0)
 			break;
 
-		if (errno != ECONNREFUSED) {
-			SYSERROR("Failed to receive state from monitor");
-			return -1;
-		}
+		if (errno != ECONNREFUSED)
+			return log_error_errno(-1, errno, "Failed to receive state from monitor");
 
 		if (timeout > 0)
 			timeout--;