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+
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 tools/include/nolibc/types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
index 30904be544ed0..16c6e9ec9451f 100644
--- a/tools/include/nolibc/types.h
+++ b/tools/include/nolibc/types.h
@@ -128,7 +128,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 {						\
@@ -145,7 +145,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;							\
 	})
 
-- 
2.17.5

On 2025-06-20 10:33:25+0200, Willy Tarreau wrote:
> 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+
> Signed-off-by: Willy Tarreau <w@1wt.eu>

Acked-by: Thomas Weißschuh <linux@weissschuh.net>

Let me know if I should apply it.

On Sat, Jun 21, 2025 at 10:19:52AM +0200, Thomas Weißschuh wrote:
> On 2025-06-20 10:33:25+0200, Willy Tarreau wrote:
> > 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+
> > Signed-off-by: Willy Tarreau <w@1wt.eu>
> 
> Acked-by: Thomas Weißschuh <linux@weissschuh.net>
> 
> Let me know if I should apply it.

As you prefer, given that you already have other ones in flight, maybe
you want to order them as desired. Otherwise I'll push it.

Thanks!
Willy

On 2025-06-21 10:21:34+0200, Willy Tarreau wrote:
> On Sat, Jun 21, 2025 at 10:19:52AM +0200, Thomas Weißschuh wrote:
> > On 2025-06-20 10:33:25+0200, Willy Tarreau wrote:
> > > 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+
> > > Signed-off-by: Willy Tarreau <w@1wt.eu>
> > 
> > Acked-by: Thomas Weißschuh <linux@weissschuh.net>
> > 
> > Let me know if I should apply it.
> 
> As you prefer, given that you already have other ones in flight, maybe
> you want to order them as desired. Otherwise I'll push it.

Then feel free to push it.
I have nothing going on right now.


Thomas