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>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index fc7fb183c7385ae08edcea403f7a62ea9c5b1f93..eb92b5cd4ef975b9d6f607bd376f798ef02ed60b 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1428,10 +1428,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;