On 30/06/2026 09:32, Hongfu Li wrote: > Add missing checks against mmap() return value, replace (void *)-1 > with MAP_FAILED for better readability and consistency. > > Signed-off-by: Hongfu Li <[email protected]>
Reviewed-by: Kevin Brodsky <[email protected]> > --- > tools/testing/selftests/mm/pkey-powerpc.h | 2 +- > tools/testing/selftests/mm/pkey_sighandler_tests.c | 2 ++ > tools/testing/selftests/mm/protection_keys.c | 12 +++++++----- > 3 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/tools/testing/selftests/mm/pkey-powerpc.h > b/tools/testing/selftests/mm/pkey-powerpc.h > index 17bf2d1b0192..2ce85580b404 100644 > --- a/tools/testing/selftests/mm/pkey-powerpc.h > +++ b/tools/testing/selftests/mm/pkey-powerpc.h > @@ -126,7 +126,7 @@ static inline void > *malloc_pkey_with_mprotect_subpage(long size, int prot, u16 p > size, prot, pkey); > pkey_assert(pkey < NR_PKEYS); > ptr = mmap(NULL, size, prot, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); > - pkey_assert(ptr != (void *)-1); > + pkey_assert(ptr != MAP_FAILED); > > ret = syscall(__NR_subpage_prot, ptr, size, NULL); > if (ret) { > diff --git a/tools/testing/selftests/mm/pkey_sighandler_tests.c > b/tools/testing/selftests/mm/pkey_sighandler_tests.c > index 882928f2912b..d185d3da26cf 100644 > --- a/tools/testing/selftests/mm/pkey_sighandler_tests.c > +++ b/tools/testing/selftests/mm/pkey_sighandler_tests.c > @@ -317,6 +317,7 @@ static void > test_sigsegv_handler_with_different_pkey_for_stack(void) > /* Set up alternate signal stack that will use the default MPK */ > sigstack.ss_sp = mmap(0, STACK_SIZE, PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + pkey_assert(sigstack.ss_sp != MAP_FAILED); > sigstack.ss_flags = 0; > sigstack.ss_size = STACK_SIZE; > > @@ -492,6 +493,7 @@ static void test_pkru_sigreturn(void) > /* Set up alternate signal stack that will use the default MPK */ > sigstack.ss_sp = mmap(0, STACK_SIZE, PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + pkey_assert(sigstack.ss_sp != MAP_FAILED); > sigstack.ss_flags = 0; > sigstack.ss_size = STACK_SIZE; > > diff --git a/tools/testing/selftests/mm/protection_keys.c > b/tools/testing/selftests/mm/protection_keys.c > index e504544e2197..96a4eb26f326 100644 > --- a/tools/testing/selftests/mm/protection_keys.c > +++ b/tools/testing/selftests/mm/protection_keys.c > @@ -586,7 +586,7 @@ static void *malloc_pkey_with_mprotect(long size, int > prot, u16 pkey) > size, prot, pkey); > pkey_assert(pkey < NR_PKEYS); > ptr = mmap(NULL, size, prot, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); > - pkey_assert(ptr != (void *)-1); > + pkey_assert(ptr != MAP_FAILED); > ret = mprotect_pkey((void *)ptr, PAGE_SIZE, prot, pkey); > pkey_assert(!ret); > record_pkey_malloc(ptr, size, prot); > @@ -609,7 +609,7 @@ static void *malloc_pkey_anon_huge(long size, int prot, > u16 pkey) > */ > size = ALIGN_UP(size, HPAGE_SIZE * 2); > ptr = mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); > - pkey_assert(ptr != (void *)-1); > + pkey_assert(ptr != MAP_FAILED); > record_pkey_malloc(ptr, size, prot); > mprotect_pkey(ptr, size, prot, pkey); > > @@ -667,7 +667,7 @@ static void *malloc_pkey_hugetlb(long size, int prot, u16 > pkey) > size = ALIGN_UP(size, HPAGE_SIZE * 2); > pkey_assert(pkey < NR_PKEYS); > ptr = mmap(NULL, size, PROT_NONE, flags, -1, 0); > - pkey_assert(ptr != (void *)-1); > + pkey_assert(ptr != MAP_FAILED); > mprotect_pkey(ptr, size, prot, pkey); > > record_pkey_malloc(ptr, size, prot); > @@ -696,7 +696,7 @@ static void *malloc_pkey(long size, int prot, u16 pkey) > pkey_assert(malloc_type < nr_malloc_types); > > ret = pkey_malloc[malloc_type](size, prot, pkey); > - pkey_assert(ret != (void *)-1); > + pkey_assert(ret != MAP_FAILED); > > malloc_type++; > if (malloc_type >= nr_malloc_types) > @@ -1114,6 +1114,7 @@ static void arch_force_pkey_reg_init(void) > * doing the XSAVE size enumeration dance. > */ > buf = mmap(NULL, 1*MB, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, > -1, 0); > + pkey_assert(buf != MAP_FAILED); > > /* These __builtins require compiling with -mxsave */ > > @@ -1680,7 +1681,8 @@ int main(void) > ksft_print_msg("running PKEY tests for unsupported CPU/OS\n"); > > ptr = mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, > -1, 0); > - assert(ptr != (void *)-1); > + if (ptr == MAP_FAILED) > + ksft_exit_fail_perror("mmap"); > test_mprotect_pkey_on_unsupported_cpu(ptr, 1); > ksft_test_result_pass("pkey on unsupported CPU/OS\n"); > ksft_finished();
