confile: cleanup set_config_idmaps()

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index a737bd778fb9729a6e0f8371d65558ab999f58bb..47dae65de3bdb2778465d68e98e1d3648f62ff41 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2042,29 +2042,27 @@ static int set_config_proc(const char *key, const char *value,
 static int set_config_idmaps(const char *key, const char *value,
                             struct lxc_conf *lxc_conf, void *data)
 {
+       __do_free struct lxc_list *idmaplist = NULL;
+       __do_free struct id_map *idmap = NULL;
        unsigned long hostid, nsid, range;
        char type;
        int ret;
-       struct lxc_list *idmaplist = NULL;
-       struct id_map *idmap = NULL;
 
        if (lxc_config_value_empty(value))
                return lxc_clear_idmaps(lxc_conf);
 
        idmaplist = malloc(sizeof(*idmaplist));
        if (!idmaplist)
-               goto on_error;
+               return ret_errno(ENOMEM);
 
        idmap = malloc(sizeof(*idmap));
        if (!idmap)
-               goto on_error;
+               return ret_errno(ENOMEM);
        memset(idmap, 0, sizeof(*idmap));
 
        ret = parse_idmaps(value, &type, &nsid, &hostid, &range);
-       if (ret < 0) {
-               ERROR("Failed to parse id mappings");
-               goto on_error;
-       }
+       if (ret < 0)
+               return log_error_errno(-EINVAL, EINVAL, "Failed to parse id mappings");
 
        INFO("Read uid map: type %c nsid %lu hostid %lu range %lu", type, nsid, hostid, range);
        if (type == 'u')
@@ -2072,7 +2070,7 @@ static int set_config_idmaps(const char *key, const char *value,
        else if (type == 'g')
                idmap->idtype = ID_TYPE_GID;
        else
-               goto on_error;
+               return ret_errno(EINVAL);
 
        idmap->hostid = hostid;
        idmap->nsid = nsid;
@@ -2088,15 +2086,10 @@ static int set_config_idmaps(const char *key, const char *value,
                if (idmap->nsid == 0)
                        lxc_conf->root_nsgid_map = idmap;
 
-       idmap = NULL;
+       move_ptr(idmap);
+       move_ptr(idmaplist);
 
        return 0;
-
-on_error:
-       free(idmaplist);
-       free(idmap);
-
-       return -1;
 }
 
 static int set_config_mount_fstab(const char *key, const char *value,