aufs: support multiple lower layers

Do it in a safe way by using strstr() to check for the substring ":/" should ':' be part of a pathname. Signed-off-by: Christian Brauner <christian.brauner@mailbox.org> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

aufs: support multiple lower layers
410d0f6e · Christian Brauner · Stéphane Graber · 9208af16 · 410d0f6e
Commit 410d0f6e authored Jan 24, 2016 by Christian Brauner Committed by Stéphane Graber Jan 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

lxcaufs.c src/lxc/bdev/lxcaufs.c +10 -4

No files found.
--- a/src/lxc/bdev/lxcaufs.c
+++ b/src/lxc/bdev/lxcaufs.c
@@ -234,7 +234,7 @@ int aufs_detect(const char *path)
 int aufs_mount(struct bdev *bdev)
 {
-	char *options, *dup, *lower, *upper;
+	char *tmp, *options, *dup, *lower, *upper;
 	int len;
 	unsigned long mntflags;
 	char *mntdata;
@@ -250,9 +250,15 @@ int aufs_mount(struct bdev *bdev)
 	//  mount -t aufs -obr=${upper}=rw:${lower}=ro lower dest
 	dup = alloca(strlen(bdev->src)+1);
 	strcpy(dup, bdev->src);
-	if (!(lower = strchr(dup, ':')))
+	/* support multiple lower layers */
-		return -22;
+	if (!(lower = strstr(dup, ":/")))
-	if (!(upper = strchr(++lower, ':')))
+			return -22;
+	lower++;
+	upper = lower;
+	while ((tmp = strstr(++upper, ":/"))) {
+		upper = tmp;
+	}
+	if (--upper == lower)
 		return -22;
 	*upper = '\0';
 	upper++;