tools/nolibc: Fix S_ISxxx macros
PATCH v2 1/1 tools/nolibc: Fix S_ISxxx macros
The mode field has the type encoded as an value in a field, not as a bit mask. Mask the mode with S_IFMT instead of each type to test. Otherwise, false positives are possible: eg S_ISDIR will return true for block devices because S_IFDIR = 0040000 and S_IFBLK = 0060000 since mode is masked with S_IFDIR instead of S_IFMT. These macros now match the similar definitions in tools/include/uapi/linux/stat.h.
--- tools/include/nolibc/types.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/include/nolibc/types.h +7 -7
@@ -26,13 +26,13 @@#define S_IFSOCK 0140000#define S_IFMT 0170000 -#define S_ISDIR (mode) (((mode) & S_IFDIR) == S_IFDIR) -#define S_ISCHR (mode) (((mode) & S_IFCHR) == S_IFCHR) -#define S_ISBLK (mode) (((mode) & S_IFBLK) == S_IFBLK) -#define S_ISREG (mode) (((mode) & S_IFREG) == S_IFREG) -#define S_ISFIFO (mode) (((mode) & S_IFIFO) == S_IFIFO) -#define S_ISLNK (mode) (((mode) & S_IFLNK) == S_IFLNK) -#define S_ISSOCK (mode) (((mode) & S_IFSOCK) == S_IFSOCK) +#define S_ISDIR (mode) (((mode) & S_IFMT) == S_IFDIR) +#define S_ISCHR (mode) (((mode) & S_IFMT) == S_IFCHR) +#define S_ISBLK (mode) (((mode) & S_IFMT) == S_IFBLK) +#define S_ISREG (mode) (((mode) & S_IFMT) == S_IFREG) +#define S_ISFIFO (mode) (((mode) & S_IFMT) == S_IFIFO) +#define S_ISLNK (mode) (((mode) & S_IFMT) == S_IFLNK) +#define S_ISSOCK (mode) (((mode) & S_IFMT) == S_IFSOCK)/* dirent types */ #define DT_UNKNOWN 0x0
Signature · 1 line
2.33.1
Willy Tarreau
maintainerHello Warner,
Quoted 6 lines · Warner Losh
The mode field has the type encoded as an value in a field, not as a bit mask. Mask the mode with
S_IFMTinstead of each type to test. Otherwise, false positives are possible: egS_ISDIRwill return true for block devices becauseS_IFDIR= 0040000 andS_IFBLK= 0060000 since mode is masked withS_IFDIRinstead ofS_IFMT. These macros now match the similar definitions intools/include/uapi/linux/stat.h.
I'm impressed to see how I managed to make that gross a mistake! Thanks for catching it and for the fix, its now queued.
Willy