Skip to content

Commit 19b8a76

Browse files
Wake Liushuahkh
authored andcommitted
kselftest/harness: Use helper to avoid zero-size memset warning
When building kselftests with a toolchain that enables source fortification (e.g., Android's build environment, which uses -D_FORTIFY_SOURCE=3), a build failure occurs in tests that use an empty FIXTURE(). The root cause is that an empty fixture struct results in `sizeof(self_private)` evaluating to 0. The compiler's fortification checks then detect the `memset()` call with a compile-time constant size of 0, issuing a `-Wuser-defined-warnings` which is promoted to an error by `-Werror`. An initial attempt to guard the call with `if (sizeof(self_private) > 0)` was insufficient. The compiler's static analysis is aggressive enough to flag the `memset(..., 0)` pattern before evaluating the conditional, thus still triggering the error. To resolve this robustly, this change introduces a `static inline` helper function, `__kselftest_memset_safe()`. This function wraps the size check and the `memset()` call. By replacing the direct `memset()` in the `__TEST_F_IMPL` macro with a call to this helper, we create an abstraction boundary. This prevents the compiler's static analyzer from "seeing" the problematic pattern at the macro expansion site, resolving the build failure. Build Context: Compiler: Android (14488419, +pgo, +bolt, +lto, +mlgo, based on r584948) clang version 22.0.0 (https://android.googlesource.com/toolchain/llvm-project 2d65e4108033380e6fe8e08b1f1826cd2bfb0c99) Relevant Options: -O2 -Wall -Werror -D_FORTIFY_SOURCE=3 -target i686-linux-android10000 Test: m kselftest_futex_futex_requeue_pi Removed Gerrit Change-Id Shuah Khan <skhan@linuxfoundation.org> Link: https://lore.kernel.org/r/20251224084120.249417-1-wakel@google.com Signed-off-by: Wake Liu <wakel@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
1 parent 0eccd4a commit 19b8a76

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

tools/testing/selftests/kselftest_harness.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070

7171
#include "kselftest.h"
7272

73+
static inline void __kselftest_memset_safe(void *s, int c, size_t n)
74+
{
75+
if (n > 0)
76+
memset(s, c, n);
77+
}
78+
7379
#define TEST_TIMEOUT_DEFAULT 30
7480

7581
/* Utilities exposed to the test definitions */
@@ -416,7 +422,7 @@
416422
self = mmap(NULL, sizeof(*self), PROT_READ | PROT_WRITE, \
417423
MAP_SHARED | MAP_ANONYMOUS, -1, 0); \
418424
} else { \
419-
memset(&self_private, 0, sizeof(self_private)); \
425+
__kselftest_memset_safe(&self_private, 0, sizeof(self_private)); \
420426
self = &self_private; \
421427
} \
422428
} \

0 commit comments

Comments
 (0)