Merge pull request #4161 from srd424/patch-1

Fix errors constructing mount string when extra mount options supplied
This commit is contained in:
Christian Brauner 2022-07-04 09:23:02 +02:00 committed by GitHub
commit 890d0da215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -445,10 +445,10 @@ int ovl_mount(struct lxc_storage *bdev)
upper, lower, mntdata);
len2 = strlen(lower) + strlen(upper) + strlen(work) +
strlen("upperdir=,lowerdir=,workdir=") +
strlen("upperdir=,lowerdir=,workdir=,") +
strlen(mntdata) + 1;
options_work = must_realloc(NULL, len2);
ret2 = snprintf(options, len2,
ret2 = snprintf(options_work, len2,
"upperdir=%s,lowerdir=%s,workdir=%s,%s", upper,
lower, work, mntdata);
} else {