uxc: fix segfault caused by use-after-free

[project/procd.git] / uxc.c

diff --git a/uxc.c b/uxc.c
index 5163b9a3e265e97c361c6d90f30a370fa8103658..a896d5ff148b6a8c1d4a43b0e751764452dec4ba 100644 (file)
--- a/uxc.c
+++ b/uxc.c
@@ -38,9 +38,10 @@
 #define UXC_VERSION "0.2"
 #define OCI_VERSION_STRING "1.0.2"
 #define UXC_ETC_CONFDIR "/etc/uxc"
-#define UXC_VOL_CONFDIR "/var/state/uxc"
+#define UXC_VOL_CONFDIR "/var/run/uxc"
 
 static bool verbose = false;
+static bool json_output = false;
 static char *confdir = UXC_ETC_CONFDIR;
 
 struct runtime_state {
@@ -67,11 +68,12 @@ enum uxc_cmd {
        CMD_UNKNOWN
 };
 
-#define OPT_ARGS "ab:fm:p:t:vVw:"
+#define OPT_ARGS "ab:fjm:p:t:vVw:"
 static struct option long_options[] = {
        {"autostart",           no_argument,            0,      'a'     },
        {"bundle",              required_argument,      0,      'b'     },
        {"force",               no_argument,            0,      'f'     },
+       {"json",                no_argument,            0,      'j'     },
        {"mounts",              required_argument,      0,      'm'     },
        {"pid-file",            required_argument,      0,      'p'     },
        {"temp-overlay-size",   required_argument,      0,      't'     },
@@ -90,7 +92,7 @@ static struct ubus_context *ctx;
 static int usage(void) {
        printf("syntax: uxc <command> [parameters ...]\n");
        printf("commands:\n");
-       printf("\tlist\t\t\t\t\t\tlist all configured containers\n");
+       printf("\tlist [--json]\t\t\t\tlist all configured containers\n");
        printf("\tcreate <conf>\t\t\t\t\t(re-)create <conf>\n");
        printf("                [--bundle <path>]\t\t\tOCI bundle at <path>\n");
        printf("                [--autostart]\t\t\t\tstart on boot\n");
@@ -361,6 +363,7 @@ static int uxc_state(char *name)
        char *bundle = NULL;
        char *jail_name = NULL;
        char *state = NULL;
+       char *tmp;
        static struct blob_buf buf;
 
        if (s)
@@ -401,7 +404,15 @@ static int uxc_state(char *name)
        blobmsg_add_string(&buf, "status", s?"stopped":"uninitialized");
        blobmsg_add_string(&buf, "bundle", bundle);
 
-       printf("%s\n", blobmsg_format_json_indent(buf.head, true, 0));
+       tmp = blobmsg_format_json_indent(buf.head, true, 0);
+       if (!tmp) {
+               blob_buf_free(&buf);
+               return ENOMEM;
+       }
+
+       printf("%s\n", tmp);
+       free(tmp);
+
        blob_buf_free(&buf);
 
        return 0;
@@ -412,10 +423,16 @@ static int uxc_list(void)
        struct blob_attr *cur, *tb[__CONF_MAX], *ts[__STATE_MAX];
        int rem;
        struct runtime_state *s = NULL;
-       char *name;
-       char *ocistatus;
+       char *name, *ocistatus, *status, *tmp;
        int container_pid = -1;
        bool autostart;
+       static struct blob_buf buf;
+       void *arr, *obj;
+
+       if (json_output) {
+               blob_buf_init(&buf, 0);
+               arr = blobmsg_open_array(&buf, "");
+       }
 
        blobmsg_for_each_attr(cur, blob_data(conf.head), rem) {
                blobmsg_parse(conf_policy, __CONF_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
@@ -434,20 +451,56 @@ static int uxc_list(void)
                        container_pid = blobmsg_get_u32(ts[STATE_PID]);
                }
 
-               printf("[%c] %s %s", autostart?'*':' ', name, ocistatus?:(s && s->running)?"creating":"stopped");
+               status = ocistatus?:(s && s->running)?"creating":"stopped";
 
-               if (s && !s->running && (s->exitcode >= 0))
-                       printf(" exitcode: %d (%s)", s->exitcode, strerror(s->exitcode));
+               if (json_output) {
+                       obj = blobmsg_open_table(&buf, "");
+                       blobmsg_add_string(&buf, "name", name);
+                       blobmsg_add_string(&buf, "status", status);
+                       blobmsg_add_u8(&buf, "autostart", autostart);
+               } else {
+                       printf("[%c] %s %s", autostart?'*':' ', name, status);
+               }
 
-               if (s && s->running && (s->runtime_pid >= 0))
-                       printf(" runtime pid: %d", s->runtime_pid);
+               if (s && !s->running && (s->exitcode >= 0)) {
+                       if (json_output)
+                               blobmsg_add_u32(&buf, "exitcode", s->exitcode);
+                       else
+                               printf(" exitcode: %d (%s)", s->exitcode, strerror(s->exitcode));
+               }
 
-               if (s && s->running && (container_pid >= 0))
-                       printf(" container pid: %d", container_pid);
+               if (s && s->running && (s->runtime_pid >= 0)) {
+                       if (json_output)
+                               blobmsg_add_u32(&buf, "runtime_pid", s->runtime_pid);
+                       else
+                               printf(" runtime pid: %d", s->runtime_pid);
+               }
+
+               if (s && s->running && (container_pid >= 0)) {
+                       if (json_output)
+                               blobmsg_add_u32(&buf, "container_pid", container_pid);
+                       else
+                               printf(" container pid: %d", container_pid);
+               }
 
-               printf("\n");
+               if (!json_output)
+                       printf("\n");
+               else
+                       blobmsg_close_table(&buf, obj);
        }
 
+       if (json_output) {
+               blobmsg_close_array(&buf, arr);
+               tmp = blobmsg_format_json_indent(buf.head, true, 0);
+               if (!tmp) {
+                       blob_buf_free(&buf);
+                       return ENOMEM;
+               }
+               printf("%s\n", tmp);
+               free(tmp);
+               blob_buf_free(&buf);
+       };
+
        return 0;
 }
 
@@ -533,12 +586,12 @@ static int uxc_create(char *name, bool immediately)
        ret = 0;
        if (ubus_lookup_id(ctx, "container", &id) ||
                ubus_invoke(ctx, id, "add", req.head, NULL, NULL, 3000)) {
+               blob_buf_free(&req);
                ret = EIO;
        }
 
        free(jailname);
        free(path);
-       blob_buf_free(&req);
 
        return ret;
 }
@@ -705,6 +758,7 @@ static int uxc_set(char *name, char *path, bool autostart, bool add, char *pidfi
        }
 
        blob_buf_free(&req);
+       close(f);
 
        return 0;
 }
@@ -995,6 +1049,10 @@ int main(int argc, char **argv)
                                force = true;
                                break;
 
+                       case 'j':
+                               json_output = true;
+                               break;
+
                        case 'p':
                                pidfile = optarg;
                                break;