From: Karel Zak <kzak@redhat.com>
Date: Tue, 12 May 2020 07:16:49 +0000 (+0200)
Subject: libblkid: fix fstatat() use in blkid__scan_dir()
X-Git-Tag: v2.36-rc1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f821f63fceca1d8480da3c724f7d3b383e6d7bd1;p=thirdparty%2Futil-linux.git

libblkid: fix fstatat() use in blkid__scan_dir()

Addresses: https://github.com/karelzak/util-linux/issues/1037
References: http://github.com/karelzak/util-linux/commit/2208b3ccb298be2675cf005b761b1668f8cd576f
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 8314a41c89..74a0d982e2 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -145,9 +145,9 @@ void blkid__scan_dir(char *dirname, dev_t devno, struct dir_list **list,
 		if (dp->d_type == DT_UNKNOWN)
 #endif
 		{
-			if (fstatat(dirfd(dir), dp->d_name, &st, 1) ||
+			if (fstatat(dirfd(dir), dp->d_name, &st, AT_SYMLINK_NOFOLLOW) ||
 			    !S_ISDIR(st.st_mode))
-				continue;	/* symlink or lstat() failed */
+				continue;	/* symlink or fstatat() failed */
 		}
 
 		if (*dp->d_name == '.' || (