From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 18 Jun 2013 19:52:24 +0000 (-0500)
Subject: conf.c: always strdup rootfs.mount
X-Git-Tag: lxc-1.0.0.alpha1~1^2~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54c30e290876c5fa6e4c7b5a511580793e4777e3;p=thirdparty%2Flxc.git

conf.c: always strdup rootfs.mount

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>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 6a43aee73..a98fbefb6 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2134,7 +2134,7 @@ struct lxc_conf *lxc_conf_init(void)
 	new->console.slave = -1;
 	new->console.name[0] = '\0';
 	new->maincmd_fd = -1;
-	new->rootfs.mount = default_rootfs_mount;
+	new->rootfs.mount = strdup(default_rootfs_mount);
 	new->kmsg = 1;
 	lxc_list_init(&new->cgroup);
 	lxc_list_init(&new->network);
@@ -3152,7 +3152,7 @@ void lxc_conf_free(struct lxc_conf *conf)
 		return;
 	if (conf->console.path)
 		free(conf->console.path);
-	if (conf->rootfs.mount != default_rootfs_mount)
+	if (conf->rootfs.mount)
 		free(conf->rootfs.mount);
 	if (conf->rootfs.path)
 		free(conf->rootfs.path);