state: additional check in lxc_wait to prevent OOB

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

diff --git a/src/lxc/state.c b/src/lxc/state.c
index 28ab60c4b99d0ab0b750a41e9597c133a5ba1071..b4de0ea50b70755ed4a420be24fcfdbf30b3d611 100644 (file)
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -19,7 +18,6 @@
 #include "cgroup.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "log.h"
 #include "lxc.h"
 #include "monitor.h"
@@ -36,18 +34,19 @@ static const char *const strstate[] = {
 const char *lxc_state2str(lxc_state_t state)
 {
        if (state < STOPPED || state > MAX_STATE - 1)
-               return NULL;
+               return "INVALID STATE";
        return strstate[state];
 }
 
 lxc_state_t lxc_str2state(const char *state)
 {
        size_t len;
-       lxc_state_t i;
-       len = sizeof(strstate)/sizeof(strstate[0]);
-       for (i = 0; i < len; i++)
-               if (!strcmp(strstate[i], state))
+
+       len = sizeof(strstate) / sizeof(strstate[0]);
+       for (lxc_state_t i = 0; i < len; i++) {
+               if (strequal(strstate[i], state))
                        return i;
+       }
 
        ERROR("invalid state '%s'", state);
        return -1;
@@ -100,10 +99,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--;
@@ -115,7 +112,7 @@ int lxc_wait(const char *lxcname, const char *states, int timeout,
        }
 
        TRACE("Retrieved state of container %s", lxc_state2str(state));
-       if (!s[state])
+       if ((state < STOPPED || state > MAX_STATE - 1) || !s[state])
                return -1;
 
        return 0;