fix failed to fallback at lxclock_name

lxclock_name will fallback to /tmp/$(id -u)/lxc$lxcpath/.$lxcname when failed to create directories into rundir. But, in currently, lxclock_name returns untill preparing directories under the /tmp, so invoker will fail to get the container lock. This patch fixes fixes this. Signed-off-by: Kohei YOSHIDA <kohei.yoshida@gehirn.co.jp>

fix failed to fallback at lxclock_name
669b6325 · Kohei YOSHIDA · 3e73d667 · 669b6325
Commit 669b6325 authored Jan 22, 2015 by Kohei YOSHIDA
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

lxclock.c src/lxc/lxclock.c +13 -4

No files found.
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -128,8 +128,11 @@ static char *lxclock_name(const char *p, const char *n)
 	}
 	ret = mkdir_p(dest, 0755);
 	if (ret < 0) {
-		/* fall back to "/tmp/" $(id -u) "/lxc/" $lxcpath / $lxcname + '\0' */
+		/* fall back to "/tmp/" + $(id -u) + "/lxc" + $lxcpath + "/" + "." + $lxcname + '\0'
-		int l2 = 34 + strlen(n) + strlen(p);
+		 * * maximum length of $(id -u) is 10 calculated by (log (2 ** (sizeof(uid_t) * 8) - 1) / log 10 + 1)
+		 * * lxcpath always starts with '/'
+		 */
+		int l2 = 22 + strlen(n) + strlen(p);
 		if (l2 > len) {
 			char *d;
 			d = realloc(dest, l2);
@@ -141,13 +144,19 @@ static char *lxclock_name(const char *p, const char *n)
 			len = l2;
 			dest = d;
 		}
-		ret = snprintf(dest, len, "/tmp/%d/lxc/%s", geteuid(), p);
+		ret = snprintf(dest, len, "/tmp/%d/lxc%s", geteuid(), p);
 		if (ret < 0 || ret >= len) {
 			free(dest);
 			free(rundir);
 			return NULL;
 		}
-		ret = snprintf(dest, len, "/tmp/%d/lxc/%s/.%s", geteuid(), p, n);
+		ret = mkdir_p(dest, 0755);
+		if (ret < 0) {
+			free(dest);
+			free(rundir);
+			return NULL;
+		}
+		ret = snprintf(dest, len, "/tmp/%d/lxc%s/.%s", geteuid(), p, n);
 	} else
 		ret = snprintf(dest, len, "%s/lock/lxc/%s/.%s", rundir, p, n);