From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 5 Aug 2020 18:50:27 +0000 (+0200)
Subject: conf: use openat() instead of open_tree()
X-Git-Tag: lxc-5.0.0~375^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3506%2Fhead;p=thirdparty%2Flxc.git

conf: use openat() instead of open_tree()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index ad3e0e575..36a2309a4 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1524,7 +1524,7 @@ static int lxc_setup_devpts(struct lxc_handler *handler)
 		return log_error_errno(-1, errno, "Failed to mount new devpts instance");
 	DEBUG("Mount new devpts instance with options \"%s\"", *opts);
 
-	devpts_fd = open_tree(-EBADF, "/dev/pts", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC | AT_EMPTY_PATH);
+	devpts_fd = openat(-EBADF, "/dev/pts", O_CLOEXEC | O_DIRECTORY | O_PATH | O_NOFOLLOW);
 	if (devpts_fd < 0) {
 		TRACE("Failed to create detached devpts mount");
 		ret = lxc_abstract_unix_send_fds(sock, NULL, 0, NULL, 0);