From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 25 Nov 2020 23:25:58 +0000 (+0000)
Subject: jail: fix and simplify userns uid/gid maps from OCI
X-Git-Url: http://git.openwrt.org/?p=project%2Fprocd.git;a=commitdiff_plain;h=5abee8f6909b4e4183e65cd730d3107d640a0306

jail: fix and simplify userns uid/gid maps from OCI

Pre-calculate allocation length more simple and make sure maps are
properly generated.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/jail/jail.c b/jail/jail.c
index f888848..f548b7a 100644
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -31,6 +31,7 @@
 #define RLIM_NLIMITS 16
 #endif
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -1835,30 +1836,12 @@ static const struct blobmsg_policy oci_linux_uidgidmap_policy[] = {
 
 static int parseOCIuidgidmappings(struct blob_attr *msg, bool is_gidmap)
 {
-	const char *map_format = "%d %d %d\n";
 	struct blob_attr *tb[__OCI_LINUX_UIDGIDMAP_MAX];
 	struct blob_attr *cur;
-	int rem, len;
-	char **mappings;
-	char *map, *curstr;
-	unsigned int cnt = 0;
-	size_t totallen = 0;
-
-	/* count number of mappings */
-	blobmsg_for_each_attr(cur, msg, rem)
-		cnt++;
-
-	if (!cnt)
-		return 0;
-
-	/* allocate array for mappings */
-	mappings = calloc(1 + cnt, sizeof(char*));
-	if (!mappings)
-		return ENOMEM;
-
-	mappings[cnt] = NULL;
+	int rem;
+	char *map;
+	size_t len, pos, totallen = 0;
 
-	cnt = 0;
 	blobmsg_for_each_attr(cur, msg, rem) {
 		blobmsg_parse(oci_linux_uidgidmap_policy, __OCI_LINUX_UIDGIDMAP_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
 
@@ -1867,32 +1850,32 @@ static int parseOCIuidgidmappings(struct blob_attr *msg, bool is_gidmap)
 		    !tb[OCI_LINUX_UIDGIDMAP_SIZE])
 			return EINVAL;
 
-		/* write mapping line into allocated string */
-		len = asprintf(&mappings[cnt++], map_format,
+		/* count length */
+		totallen += snprintf(NULL, 0, "%d %d %d\n",
 			 blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_CONTAINERID]),
 			 blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_HOSTID]),
 			 blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_SIZE]));
-
-		if (len < 0)
-			return ENOMEM;
-
-		totallen += len;
 	}
 
 	/* allocate combined mapping string */
-	map = malloc(1 + totallen);
+	map = malloc(totallen + 1);
 	if (!map)
 		return ENOMEM;
 
-	map[0] = '\0';
+	pos = 0;
+	blobmsg_for_each_attr(cur, msg, rem) {
+		blobmsg_parse(oci_linux_uidgidmap_policy, __OCI_LINUX_UIDGIDMAP_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
 
-	/* concatenate mapping strings into combined string */
-	curstr = mappings[0];
-	while (curstr) {
-		strcat(map, curstr);
-		free(curstr++);
+		/* write mapping line into pre-allocated string */
+		len = snprintf(&map[pos], totallen + 1, "%d %d %d\n",
+			 blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_CONTAINERID]),
+			 blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_HOSTID]),
+			 blobmsg_get_u32(tb[OCI_LINUX_UIDGIDMAP_SIZE]));
+		pos += len;
+		totallen -= len;
 	}
-	free(mappings);
+
+	assert(totallen == 0);
 
 	if (is_gidmap)
 		opts.gidmap = map;