From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 14 Dec 2020 16:52:44 +0000 (+0100)
Subject: conf: fix block-device based rootfs mounting
X-Git-Tag: lxc-5.0.0~328^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26ea5533c941baee14923dfc3edfb9c91666d245;p=thirdparty%2Flxc.git

conf: fix block-device based rootfs mounting

Fixes: #3598
Cc: stable-4.0
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 9f631e0c2..27f970668 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3135,6 +3135,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
 		if (ret < 0)
 			return log_error(-1, "Failed to bind mount container / onto itself");
 
+		conf->rootfs.mntpt_fd = openat(-EBADF, path, O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_PATH | O_NOCTTY);
+		if (conf->rootfs.mntpt_fd < 0)
+			return log_error_errno(-errno, errno, "Failed to open file descriptor for container rootfs");
+
 		return log_trace(0, "Bind mounted container / onto itself");
 	}