From 7a0bcca3105ca9c9987d5572bf72f02e35a28bcb Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 29 May 2018 00:54:16 +0200 Subject: [PATCH] conf: make tmp_umount_proc bool Signed-off-by: Christian Brauner --- src/lxc/conf.c | 10 +++++----- src/lxc/conf.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 2c6efe71f..dcbee2868 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -2676,7 +2676,7 @@ struct lxc_conf *lxc_conf_init(void) lxc_list_init(&new->state_clients); new->lsm_aa_profile = NULL; new->lsm_se_context = NULL; - new->tmp_umount_proc = 0; + new->tmp_umount_proc = false; /* if running in a new user namespace, init and COMMAND * default to running as UID/GID 0 when using lxc-execute */ @@ -3158,7 +3158,7 @@ int lxc_create_tmp_proc_mount(struct lxc_conf *conf) if (conf->rootfs.path) return -1; } else if (mounted == 1) { - conf->tmp_umount_proc = 1; + conf->tmp_umount_proc = true; } return 0; @@ -3166,11 +3166,11 @@ int lxc_create_tmp_proc_mount(struct lxc_conf *conf) void tmp_proc_unmount(struct lxc_conf *lxc_conf) { - if (lxc_conf->tmp_umount_proc != 1) + if (!lxc_conf->tmp_umount_proc) return; - umount("/proc"); - lxc_conf->tmp_umount_proc = 0; + (void)umount2("/proc", MNT_DETACH); + lxc_conf->tmp_umount_proc = false; } /* Walk /proc/mounts and change any shared entries to slave. */ diff --git a/src/lxc/conf.h b/src/lxc/conf.h index e28f54b85..1565cdef9 100644 --- a/src/lxc/conf.h +++ b/src/lxc/conf.h @@ -271,7 +271,7 @@ struct lxc_conf { char *lsm_aa_profile; unsigned int lsm_aa_allow_incomplete; char *lsm_se_context; - int tmp_umount_proc; + bool tmp_umount_proc; char *seccomp; /* filename with the seccomp rules */ #if HAVE_SCMP_FILTER_CTX scmp_filter_ctx seccomp_ctx;