]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
tools/nolibc: properly align dirent buffer
authorThomas Weißschuh <linux@weissschuh.net>
Sat, 19 Apr 2025 10:46:21 +0000 (12:46 +0200)
committerThomas Weißschuh <linux@weissschuh.net>
Sat, 19 Apr 2025 12:18:01 +0000 (14:18 +0200)
As byte buffer is overlaid with a 'struct dirent64'.
it has to satisfy the structs alignment requirements.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Fixes: 665fa8dea90d ("tools/nolibc: add support for directory access")
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250419-nolibc-ubsan-v2-4-060b8a016917@weissschuh.net
tools/include/nolibc/dirent.h

index c5c30d0dd6806b1bec2fa8120a3df29aaa201393..946a697e98e4c7bb0970b163ffdfe0e069b1d160 100644 (file)
@@ -7,6 +7,7 @@
 #ifndef _NOLIBC_DIRENT_H
 #define _NOLIBC_DIRENT_H
 
+#include "compiler.h"
 #include "stdint.h"
 #include "types.h"
 
@@ -58,7 +59,7 @@ int closedir(DIR *dirp)
 static __attribute__((unused))
 int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 {
-       char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1];
+       char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1] __nolibc_aligned_as(struct linux_dirent64);
        struct linux_dirent64 *ldir = (void *)buf;
        intptr_t i = (intptr_t)dirp;
        int fd, ret;