diff --git a/src/lxc/bdev/lxcoverlay.c b/src/lxc/bdev/lxcoverlay.c index 4d30f3ce0..22290cf54 100644 --- a/src/lxc/bdev/lxcoverlay.c +++ b/src/lxc/bdev/lxcoverlay.c @@ -309,7 +309,7 @@ char *ovl_getlower(char *p) int ovl_mount(struct bdev *bdev) { - char *options, *dup, *lower, *upper; + char *tmp, *options, *dup, *lower, *upper; char *options_work, *work, *lastslash; int lastslashidx; int len, len2; @@ -331,9 +331,15 @@ int ovl_mount(struct bdev *bdev) */ 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++;