conf: close fd in lxc_setup_devpts()

This left the file descriptor to the underlying /dev/ptmx file open which confused the hell out of criu. Let's close it. Closes https://github.com/lxc/lxd/issues/3243. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: close fd in lxc_setup_devpts()
74363c78 · Christian Brauner · Stéphane Graber · 814e9e3a · 74363c78
Unverified Commit 74363c78 authored Apr 28, 2017 by Christian Brauner Committed by Stéphane Graber May 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

conf.c src/lxc/conf.c +2 -1

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1369,10 +1369,11 @@ static int lxc_setup_devpts(int num_pts)
 		SYSERROR("failed to create dummy \"/dev/ptmx\" file as bind mount target");
 		return -1;
 	}
+	close(ret);
 	DEBUG("created dummy \"/dev/ptmx\" file as bind mount target");

 	/* Fallback option: create symlink /dev/ptmx -> /dev/pts/ptmx  */
-	ret = mount("/dev/pts/ptmx", "/dev/ptmx", "none", MS_BIND, 0);
+	ret = mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL);
 	if (!ret) {
 		DEBUG("bind mounted \"/dev/pts/ptmx\" to \"/dev/ptmx\"");
 		return 0;