proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-05 04:33:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aufs: support multiple lower layers

Browse Source 
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>
This commit is contained in:
Christian Brauner 2016-01-24 00:17:36 +01:00 committed by Stéphane Graber
parent 9208af160e
commit 410d0f6e5c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/bdev/lxcaufs.c
View File

@ -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, ':')))
return -22;
if (!(upper = strchr(++lower, ':')))
/* support multiple lower layers */
if (!(lower = strstr(dup, ":/")))
return -22;
lower++;
upper = lower;
while ((tmp = strstr(++upper, ":/"))) {
upper = tmp;
}
if (--upper == lower)
return -22;
*upper = '\0';
upper++;