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

conf: check for successful mount entry parse

Browse Source 
Since liblxc is completely in control of the mount entry file we should
only consider a parse successful when EOF is reached.

Closes #2798.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-01-27 02:22:43 +01:00
parent 3309e10c31
commit 9d03d85733
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/conf.c
View File

@ -2336,11 +2336,12 @@ static int mount_file_entries(const struct lxc_conf *conf,
const struct lxc_rootfs *rootfs, FILE *file, const struct lxc_rootfs *rootfs, FILE *file,
const char *lxc_name, const char *lxc_path) const char *lxc_name, const char *lxc_path)
{ {
char buf[4096]; char buf[PATH_MAX];
struct mntent mntent; struct mntent mntent;
int ret = -1;
while (getmntent_r(file, &mntent, buf, sizeof(buf))) { while (getmntent_r(file, &mntent, buf, sizeof(buf))) {
int ret;
if (!rootfs->path) if (!rootfs->path)
ret = mount_entry_on_systemfs(&mntent); ret = mount_entry_on_systemfs(&mntent);
else if (mntent.mnt_dir[0] != '/') else if (mntent.mnt_dir[0] != '/')
@ -2348,14 +2349,17 @@ static int mount_file_entries(const struct lxc_conf *conf,
lxc_name, lxc_path); lxc_name, lxc_path);
else else
ret = mount_entry_on_absolute_rootfs(&mntent, rootfs, ret = mount_entry_on_absolute_rootfs(&mntent, rootfs,
lxc_name, lxc_path); lxc_name, lxc_path);
if (ret < 0) if (ret < 0)
return -1; return -1;
} }
ret = 0;
INFO("Finished setting up mounts"); if (!feof(file) || ferror(file)) {
return ret; ERROR("Failed to parse mount entries");
return -1;
}
return 0;
} }
static int setup_mount(const struct lxc_conf *conf, static int setup_mount(const struct lxc_conf *conf,