tools/nolibc: fix spelling of FD_SETBITMASK in FD_* macros

commit a477629baa2a0e9991f640af418e8c973a1c08e3 upstream.

While nolibc-test does test syscalls, it doesn't test as much the rest
of the macros, and a wrong spelling of FD_SETBITMASK in commit
feaf75658783a broke programs using either FD_SET() or FD_CLR() without
being noticed. Let's fix these macros.

Fixes: feaf75658783a ("nolibc: fix fd_set type")
Cc: stable@vger.kernel.org # v6.2+
Acked-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
index b26a5d0c417c7c3b232f28e78cdd6d94a759b7bc..9d606c7138a86fbfb9d23b1b3918f7c3e80150e9 100644 (file)
--- a/tools/include/nolibc/types.h
+++ b/tools/include/nolibc/types.h
@@ -127,7 +127,7 @@ typedef struct {
                int __fd = (fd);                                        \
                if (__fd >= 0)                                          \
                        __set->fds[__fd / FD_SETIDXMASK] &=             \
-                               ~(1U << (__fd & FX_SETBITMASK));        \
+                               ~(1U << (__fd & FD_SETBITMASK));        \
        } while (0)
 
 #define FD_SET(fd, set) do {                                           \
@@ -144,7 +144,7 @@ typedef struct {
                int __r = 0;                                            \
                if (__fd >= 0)                                          \
                        __r = !!(__set->fds[__fd / FD_SETIDXMASK] &     \
-1U << (__fd & FD_SET_BITMASK));                                                \
+1U << (__fd & FD_SETBITMASK));                                         \
                __r;                                                    \
        })