coverity: #1425748

Time of check time of use Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

coverity: #1425748
2f7268a9 · Christian Brauner · be20cadb · 2f7268a9
Unverified Commit 2f7268a9 authored Jun 15, 2018 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

conf.c src/lxc/conf.c +4 -9

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1541,16 +1541,11 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
 	if (ret < 0 || (size_t)ret >= sizeof(devpts_mntopts))
 		return -1;
-	/* Unmount old devpts instance. */
+	ret = umount2("/dev/pts", MNT_DETACH);
-	ret = access("/dev/pts/ptmx", F_OK);
+	if (ret < 0)
-	if (!ret) {
+		WARN("%s - Failed to unmount old devpts instance", strerror(errno));
-		ret = umount("/dev/pts");
+	else
-		if (ret < 0) {
-			SYSERROR("Failed to unmount old devpts instance");
-			return -1;
-		}
 		DEBUG("Unmounted old devpts instance");
-	}
 	/* Create mountpoint for devpts instance. */
 	ret = mkdir("/dev/pts", 0755);