trace: don't leak file descriptor in error path

[project/procd.git] / uxc.c

diff --git a/uxc.c b/uxc.c
index 5b39e9089cfc1038b6677f677c48b92ab4d3af62..50262a6db2ffb67789771ac88c2d737149836183 100644 (file)
--- a/uxc.c
+++ b/uxc.c
@@ -37,9 +37,11 @@
 
 #define UXC_VERSION "0.2"
 #define OCI_VERSION_STRING "1.0.2"
-#define UXC_CONFDIR "/etc/uxc"
+#define UXC_ETC_CONFDIR "/etc/uxc"
+#define UXC_VOL_CONFDIR "/var/run/uxc"
 
 static bool verbose = false;
+static char *confdir = UXC_ETC_CONFDIR;
 
 struct runtime_state {
        struct avl_node avl;
@@ -94,7 +96,7 @@ static int usage(void) {
        printf("                [--autostart]\t\t\t\tstart on boot\n");
        printf("                [--temp-overlay-size size]\t\tuse tmpfs overlay with {size}\n");
        printf("                [--write-overlay-path path]\t\tuse overlay on {path}\n");
-       printf("                [--volumes v1,v2,...,vN]\t\trequire volumes to be available\n");
+       printf("                [--mounts v1,v2,...,vN]\t\trequire filesystems to be available\n");
        printf("\tstart <conf>\t\t\t\t\tstart container <conf>\n");
        printf("\tstate <conf>\t\t\t\t\tget state of container <conf>\n");
        printf("\tkill <conf> [<signal>]\t\t\t\tsend signal to container <conf>\n");
@@ -134,8 +136,14 @@ static int conf_load(void)
        glob_t gl;
        char *globstr;
        void *c, *o;
+       struct stat sb;
+
+       if (!stat(UXC_VOL_CONFDIR, &sb)) {
+               if (sb.st_mode & S_IFDIR)
+                       confdir = UXC_VOL_CONFDIR;
+       }
 
-       if (asprintf(&globstr, "%s/*.json", UXC_CONFDIR) == -1)
+       if (asprintf(&globstr, "%s/*.json", confdir) == -1)
                return ENOMEM;
 
        blob_buf_init(&conf, 0);
@@ -248,7 +256,9 @@ static void get_ocistate(struct blob_attr **ocistate, const char *name)
        int ret;
        *ocistate = NULL;
 
-       asprintf(&objname, "container.%s", name);
+       if (asprintf(&objname, "container.%s", name) == -1)
+               exit(ENOMEM);
+
        ret = ubus_lookup_id(ctx, objname, &id);
        free(objname);
        if (ret)
@@ -350,13 +360,20 @@ static int uxc_state(char *name)
        int rem;
        char *bundle = NULL;
        char *jail_name = NULL;
+       char *state = NULL;
+       char *tmp;
        static struct blob_buf buf;
 
        if (s)
                ocistate = s->ocistate;
 
        if (ocistate) {
-               printf("%s\n", blobmsg_format_json_indent(ocistate, true, 0));
+               state = blobmsg_format_json_indent(ocistate, true, 0);
+               if (!state)
+                       return 1;
+
+               printf("%s\n", state);
+               free(state);
                return 0;
        }
 
@@ -385,7 +402,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;
@@ -447,6 +472,11 @@ static int uxc_create(char *name, bool immediately)
        void *in, *ins, *j;
        bool found = false;
 
+       s = avl_find_element(&runtime, name, s, avl);
+
+       if (s && (s->running))
+               return EEXIST;
+
        blobmsg_for_each_attr(cur, blob_data(conf.head), rem) {
                blobmsg_parse(conf_policy, __CONF_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
                if (!tb[CONF_NAME] || !tb[CONF_PATH])
@@ -456,30 +486,25 @@ static int uxc_create(char *name, bool immediately)
                        continue;
 
                found = true;
-               path = strdup(blobmsg_get_string(tb[CONF_PATH]));
-
-               if (tb[CONF_PIDFILE])
-                       pidfile = strdup(blobmsg_get_string(tb[CONF_PIDFILE]));
-
-               if (tb[CONF_TEMP_OVERLAY_SIZE])
-                       tmprwsize = strdup(blobmsg_get_string(tb[CONF_TEMP_OVERLAY_SIZE]));
-
-               if (tb[CONF_WRITE_OVERLAY_PATH])
-                       writepath = strdup(blobmsg_get_string(tb[CONF_WRITE_OVERLAY_PATH]));
-
-               break;
        }
 
        if (!found)
                return ENOENT;
 
-       s = avl_find_element(&runtime, name, s, avl);
+       path = blobmsg_get_string(tb[CONF_PATH]);
+
+       if (tb[CONF_PIDFILE])
+               pidfile = blobmsg_get_string(tb[CONF_PIDFILE]);
+
+       if (tb[CONF_TEMP_OVERLAY_SIZE])
+               tmprwsize = blobmsg_get_string(tb[CONF_TEMP_OVERLAY_SIZE]);
+
+       if (tb[CONF_WRITE_OVERLAY_PATH])
+               writepath = blobmsg_get_string(tb[CONF_WRITE_OVERLAY_PATH]);
 
-       if (s && (s->running))
-               return EEXIST;
 
        if (tb[CONF_JAIL])
-               jailname = strdup(blobmsg_get_string(tb[CONF_JAIL]));
+               jailname = blobmsg_get_string(tb[CONF_JAIL]);
 
        blob_buf_init(&req, 0);
        blobmsg_add_string(&req, "name", name);
@@ -504,9 +529,15 @@ static int uxc_create(char *name, bool immediately)
        blobmsg_close_table(&req, in);
        blobmsg_close_table(&req, ins);
 
-       if (verbose)
-               fprintf(stderr, "adding container to procd:\n\t%s\n",
-                       blobmsg_format_json_indent(req.head, true, 1));
+       if (verbose) {
+               char *tmp;
+               tmp = blobmsg_format_json_indent(req.head, true, 1);
+               if (!tmp)
+                       return ENOMEM;
+
+               fprintf(stderr, "adding container to procd:\n\t%s\n", tmp);
+               free(tmp);
+       }
 
        ret = 0;
        if (ubus_lookup_id(ctx, "container", &id) ||
@@ -526,7 +557,9 @@ static int uxc_start(const char *name)
        char *objname;
        unsigned int id;
 
-       asprintf(&objname, "container.%s", name);
+       if (asprintf(&objname, "container.%s", name) == -1)
+               return ENOMEM;
+
        if (ubus_lookup_id(ctx, objname, &id))
                return ENOENT;
 
@@ -567,7 +600,9 @@ static int uxc_kill(char *name, int signal)
        blobmsg_add_u32(&req, "signal", signal);
        blobmsg_add_string(&req, "name", name);
 
-       asprintf(&objname, "container.%s", name);
+       if (asprintf(&objname, "container.%s", name) == -1)
+               return ENOMEM;
+
        ret = ubus_lookup_id(ctx, objname, &id);
        free(objname);
        if (ret)
@@ -624,12 +659,12 @@ static int uxc_set(char *name, char *path, bool autostart, bool add, char *pidfi
                        return ENOTDIR;
        }
 
-       ret = mkdir(UXC_CONFDIR, 0755);
+       ret = mkdir(confdir, 0755);
 
        if (ret && errno != EEXIST)
                return ret;
 
-       if (asprintf(&fname, "%s/%s.json", UXC_CONFDIR, name) < 1)
+       if (asprintf(&fname, "%s/%s.json", confdir, name) == -1)
                return ENOMEM;
 
        f = open(fname, O_WRONLY | O_CREAT | O_TRUNC, 0644);
@@ -637,12 +672,12 @@ static int uxc_set(char *name, char *path, bool autostart, bool add, char *pidfi
                return errno;
 
        if (!add) {
-               keeppath = strdup(blobmsg_get_string(tb[CONF_PATH]));
+               keeppath = blobmsg_get_string(tb[CONF_PATH]);
                if (tb[CONF_WRITE_OVERLAY_PATH])
-                       writepath = strdup(blobmsg_get_string(tb[CONF_WRITE_OVERLAY_PATH]));
+                       writepath = blobmsg_get_string(tb[CONF_WRITE_OVERLAY_PATH]);
 
                if (tb[CONF_TEMP_OVERLAY_SIZE])
-                       tmprwsize = strdup(blobmsg_get_string(tb[CONF_TEMP_OVERLAY_SIZE]));
+                       tmprwsize = blobmsg_get_string(tb[CONF_TEMP_OVERLAY_SIZE]);
        }
 
        blob_buf_init(&req, 0);
@@ -672,13 +707,14 @@ static int uxc_set(char *name, char *path, bool autostart, bool add, char *pidfi
                }
                blobmsg_close_array(&req, mntarr);
        }
-
-       dprintf(f, "%s\n", blobmsg_format_json_indent(req.head, true, 0));
-
-       if (!add)
-               free(keeppath);
+       tmp = blobmsg_format_json_indent(req.head, true, 0);
+       if (tmp) {
+               dprintf(f, "%s\n", tmp);
+               free(tmp);
+       }
 
        blob_buf_free(&req);
+       close(f);
 
        return 0;
 }