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

conf.c: always strdup rootfs.mount

Browse Source 
The reason is that the generic code which handles reading
lxc.rootfs.mount always frees the old value if not NULL.
So without this setting lxc.rootfs.mount = /mnt causes
segfault.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2013-06-18 14:52:24 -05:00
parent 37903589a2
commit 54c30e2908
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/conf.c
View File

@ -2134,7 +2134,7 @@ struct lxc_conf *lxc_conf_init(void)
new->console.slave = -1; new->console.slave = -1;
new->console.name[0] = '\0'; new->console.name[0] = '\0';
new->maincmd_fd = -1; new->maincmd_fd = -1;
new->rootfs.mount = default_rootfs_mount; new->rootfs.mount = strdup(default_rootfs_mount);
new->kmsg = 1; new->kmsg = 1;
lxc_list_init(&new->cgroup); lxc_list_init(&new->cgroup);
lxc_list_init(&new->network); lxc_list_init(&new->network);
@ -3152,7 +3152,7 @@ void lxc_conf_free(struct lxc_conf *conf)
return; return;
if (conf->console.path) if (conf->console.path)
free(conf->console.path); free(conf->console.path);
if (conf->rootfs.mount != default_rootfs_mount) if (conf->rootfs.mount)
free(conf->rootfs.mount); free(conf->rootfs.mount);
if (conf->rootfs.path) if (conf->rootfs.path)
free(conf->rootfs.path); free(conf->rootfs.path);