[merged mm-nonmm-stable] selftests-prctl-fix-non-anonymous-vma-mapping-in-set-anon-vma-name-test.patch removed from -mm tree
Andrew Morton <[email protected]>
| Newsgroups | org.kernel.vger.mm-commits |
|---|---|
| Message-ID | <[email protected]> |
The quilt patch titled
Subject: selftests/prctl: fix non-anonymous VMA mapping in set-anon-vma-name test
has been removed from the -mm tree. Its filename was
selftests-prctl-fix-non-anonymous-vma-mapping-in-set-anon-vma-name-test.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Hongfu Li <[email protected]>
Subject: selftests/prctl: fix non-anonymous VMA mapping in set-anon-vma-name test
Date: Mon, 3 Aug 2026 18:30:46 +0800
The test creates a non-anonymous VMA (ptr_not_anon) via mmap() with
MAP_PRIVATE but without MAP_ANONYMOUS, using fd=0 (stdin) as the file
descriptor. This always fails because fd=0 is not a regular file, and the
failure was hidden because ASSERT_NE() incorrectly checked for NULL
instead of MAP_FAILED.
Fix by using mkstemp() + ftruncate() to create a real temporary file, then
mapping it with MAP_PRIVATE to obtain a genuine file-backed VMA. Also fix
the mmap() error checks to use MAP_FAILED instead of NULL, and pass fd=-1
for the anonymous mapping for clarity. The temp file is unlinked
immediately so it does not persist on disk.
Link: https://lore.kernel.org/[email protected]
Signed-off-by: Hongfu Li <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Wei Yang <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
tools/testing/selftests/prctl/set-anon-vma-name-test.c | 21 +++++++---
1 file changed, 16 insertions(+), 5 deletions(-)
--- a/tools/testing/selftests/prctl/set-anon-vma-name-test.c~selftests-prctl-fix-non-anonymous-vma-mapping-in-set-anon-vma-name-test
+++ a/tools/testing/selftests/prctl/set-anon-vma-name-test.c
@@ -4,11 +4,13 @@
*/
#include <errno.h>
+#include <fcntl.h>
#include <sys/prctl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <string.h>
+#include <unistd.h>
#include "kselftest_harness.h"
@@ -73,15 +75,24 @@ int was_renaming_successful(char *target
FIXTURE(vma) {
void *ptr_anon, *ptr_not_anon;
+ int fd_not_anon;
};
FIXTURE_SETUP(vma) {
+ char template[] = "./set-anon-vma-test-XXXXXX";
+
self->ptr_anon = mmap(NULL, AREA_SIZE, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
- ASSERT_NE(self->ptr_anon, NULL);
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ ASSERT_NE(self->ptr_anon, MAP_FAILED);
+
+ self->fd_not_anon = mkstemp(template);
+ ASSERT_NE(self->fd_not_anon, -1);
+ unlink(template);
+ ASSERT_EQ(ftruncate(self->fd_not_anon, AREA_SIZE), 0);
self->ptr_not_anon = mmap(NULL, AREA_SIZE, PROT_READ | PROT_WRITE,
- MAP_PRIVATE, 0, 0);
- ASSERT_NE(self->ptr_not_anon, NULL);
+ MAP_PRIVATE, self->fd_not_anon, 0);
+ ASSERT_NE(self->ptr_not_anon, MAP_FAILED);
+ close(self->fd_not_anon);
}
FIXTURE_TEARDOWN(vma) {
@@ -98,7 +109,7 @@ TEST_F(vma, renaming) {
EXPECT_EQ(rename_vma((unsigned long)self->ptr_anon, AREA_SIZE, BAD_NAME), -EINVAL);
TH_LOG("Try to rename non-anonymous VMA");
- EXPECT_EQ(rename_vma((unsigned long) self->ptr_not_anon, AREA_SIZE, GOOD_NAME), -EINVAL);
+ EXPECT_EQ(rename_vma((unsigned long) self->ptr_not_anon, AREA_SIZE, GOOD_NAME), -EBADF);
}
TEST_HARNESS_MAIN
_
Patches currently in -mm which might be from [email protected] are
ksm-update-comments-and-docs-to-reference-folio-mapping.patch
mm-use-a-folio-in-the-softleaf_is_device_private-path.patch
selftests-mm-drop-duplicate-test_seal_mprotect_two_vma_with_gap-call.patch
selftests-mm-fix-read_file-return-value-check.patch
mm-swap-fix-swap_cluster_lock-config_swap-stub-signature-mismatch.patch
mm-cma-remove-stray-newline-from-auto-generated-cma-area-name.patch