Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Lukas Czerner <lczerner@redhat.com>
To:     linux-ext4@vger.kernel.org
Cc:     tytso@mit.edu, Zdenek Kabelac <zkabelac@redhat.com>,
        Karel Zak <kzak@redhat.com>,
        Carlos Maiolino <cmaiolino@redhat.com>
Subject: [PATCH v2] libext2fs/ismounted.c: check open(O_EXCL) before mntent file
Date:   Tue,  3 Mar 2020 14:53:48 +0100
Message-Id: <20200303135348.20827-1-lczerner@redhat.com>
In-Reply-To: <20200225143445.13182-1-lczerner@redhat.com>
References: <20200225143445.13182-1-lczerner@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

Currently the ext2fs_check_mount_point() will use the open(O_EXCL) check
on linux after all the other checks are done. However it is not
necessary to check mntent if open(O_EXCL) succeeds because it means that
the device is not mounted.

Moreover the commit ea4d53b7 introduced a regression where a following
set of commands fails:

vgcreate mygroup /dev/sda
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4 /dev/mygroup/lvol0
mount /dev/mygroup/lvol0 /mnt
lvrename /dev/mygroup/lvol0 /dev/mygroup/lvol1
lvcreate -L 1G -n lvol0 mygroup
mkfs.ext4 /dev/mygroup/lvol0   <<<--- This fails

It fails because it thinks that /dev/mygroup/lvol0 is mounted because
the device name in /proc/mounts is not updated following the lvrename.

Move the open(O_EXCL) check before the mntent check and return
immediatelly if the device is not busy.

Fixes: ea4d53b7 ("libext2fs/ismounted.c: check device id in advance to sk=
ip false device names")
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Reported-by: Karel Zak <kzak@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
---
 lib/ext2fs/ismounted.c | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index c0215692..46d330d9 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -352,6 +352,7 @@ errcode_t ext2fs_check_mount_point(const char *device=
, int *mount_flags,
 				  char *mtpt, int mtlen)
 {
 	errcode_t	retval =3D 0;
+	int 		busy =3D 0;
=20
 	if (getenv("EXT2FS_PRETEND_RO_MOUNT")) {
 		*mount_flags =3D EXT2_MF_MOUNTED | EXT2_MF_READONLY;
@@ -366,6 +367,30 @@ errcode_t ext2fs_check_mount_point(const char *devic=
e, int *mount_flags,
 		return 0;
 	}
=20
+#ifdef __linux__ /* This only works on Linux 2.6+ systems */
+	{
+		struct stat st_buf;
+
+		if (stat(device, &st_buf) =3D=3D 0 &&
+		    ext2fsP_is_disk_device(st_buf.st_mode)) {
+			int fd =3D open(device, O_RDONLY | O_EXCL);
+
+			if (fd >=3D 0) {
+				/*
+				 * The device is not busy so it's
+				 * definitelly not mounted. No need to
+				 * to perform any more checks.
+				 */
+				close(fd);
+				*mount_flags =3D 0;
+				return 0;
+			} else if (errno =3D=3D EBUSY) {
+				busy =3D 1;
+			}
+		}
+	}
+#endif
+
 	if (is_swap_device(device)) {
 		*mount_flags =3D EXT2_MF_MOUNTED | EXT2_MF_SWAP;
 		strncpy(mtpt, "<swap>", mtlen);
@@ -386,21 +411,8 @@ errcode_t ext2fs_check_mount_point(const char *devic=
e, int *mount_flags,
 	if (retval)
 		return retval;
=20
-#ifdef __linux__ /* This only works on Linux 2.6+ systems */
-	{
-		struct stat st_buf;
-
-		if (stat(device, &st_buf) =3D=3D 0 &&
-		    ext2fsP_is_disk_device(st_buf.st_mode)) {
-			int fd =3D open(device, O_RDONLY | O_EXCL);
-
-			if (fd >=3D 0)
-				close(fd);
-			else if (errno =3D=3D EBUSY)
-				*mount_flags |=3D EXT2_MF_BUSY;
-		}
-	}
-#endif
+	if (busy)
+		*mount_flags |=3D EXT2_MF_BUSY;
=20
 	return 0;
 }
--=20
2.21.1