From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 30 Jul 2018 18:30:50 +0000 (+0200)
Subject: conf: don't return a clobbered errno value
X-Git-Tag: lxc-3.1.0~186^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2475%2Fhead;p=thirdparty%2Flxc.git

conf: don't return a clobbered errno value

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 7fa5a1504..d691e46f9 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1418,7 +1418,7 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
 		f = fopen("./proc/self/mountinfo", "r");
 		if (!f) {
 			SYSERROR("Failed to open \"/proc/self/mountinfo\"");
-			return -errno;
+			return -1;
 		}
 
 		while (fgets(buf, LXC_LINELEN, f)) {
@@ -3466,7 +3466,7 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
 		ret = mount(path, path, "rootfs", MS_BIND, NULL);
 		if (ret < 0) {
 			ERROR("Failed to bind mount container / onto itself");
-			return -errno;
+			return -1;
 		}
 
 		TRACE("Bind mounted container / onto itself");