From: Sarthak Sharma <sarthak.sharma@arm.com>
To: akpm@linux-foundation.org, david@kernel.org
Cc: ljs@kernel.org, liam@infradead.org, vbabka@suse.com,
rppt@kernel.org, surenb@google.com, mhocko@suse.com,
shuah@kernel.org, jhubbard@nvidia.com, kaleshsingh@google.com,
anshuman.khandual@arm.com, linux-mm@kvack.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Sarthak Sharma <sarthak.sharma@arm.com>
Subject: [PATCH v2 08/12] selftests/mm: mremap_test: handle cleanup after mmap failures
Date: Tue, 6 Oct 2026 14:55:07 +0530 [thread overview]
Message-ID: <20261006092511.145776-9-sarthak.sharma@arm.com> (raw)
In-Reply-To: <20261006092511.145776-1-sarthak.sharma@arm.com>
In several tests, when target mapping fails, we directly
jump to the result handling, without unmapping the
previously created source mapping. This leaks the
source mapping. Unmap the source mapping when target
mapping fails.
Also bypass munmap() when source mapping fails in
mremap_move_within_range().
Signed-off-by: Sarthak Sharma <sarthak.sharma@arm.com>
---
tools/testing/selftests/mm/mremap_test.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c
index 833efa85e5c6..37bba5049ecc 100644
--- a/tools/testing/selftests/mm/mremap_test.c
+++ b/tools/testing/selftests/mm/mremap_test.c
@@ -340,7 +340,7 @@ static void mremap_move_within_range(unsigned int pattern_seed, char *rand_addr)
if (new_ptr == MAP_FAILED) {
ksft_perror("mremap");
success = 0;
- goto out;
+ goto out_unmap;
}
/* Verify byte pattern after remapping */
@@ -357,9 +357,9 @@ static void mremap_move_within_range(unsigned int pattern_seed, char *rand_addr)
}
}
-out:
+out_unmap:
munmap(ptr, size);
-
+out:
ksft_test_result(success, "%s\n", test_name);
}
@@ -415,7 +415,7 @@ static void mremap_move_multiple_vmas(unsigned int pattern_seed,
if (tgt_ptr == MAP_FAILED) {
ksft_perror("mmap");
success = false;
- goto out;
+ goto out_unmap_src;
}
if (munmap(tgt_ptr, 2 * size)) {
ksft_perror("munmap");
@@ -501,6 +501,7 @@ static void mremap_move_multiple_vmas(unsigned int pattern_seed,
out_unmap:
munmap(tgt_ptr, 2 * size);
+out_unmap_src:
munmap(ptr, size);
out:
ksft_test_result(success, "%s%s\n", test_name, dont_unmap ? " [dontunmap]" : "");
@@ -529,7 +530,7 @@ static void mremap_shrink_multiple_vmas(unsigned long page_size,
if (tgt_ptr == MAP_FAILED) {
ksft_perror("mmap");
success = false;
- goto out;
+ goto out_unmap_src;
}
if (munmap(tgt_ptr, size)) {
ksft_perror("munmap");
@@ -573,6 +574,7 @@ static void mremap_shrink_multiple_vmas(unsigned long page_size,
out_unmap:
munmap(tgt_ptr, size);
+out_unmap_src:
munmap(ptr, size);
out:
ksft_test_result(success, "%s%s\n", test_name, inplace ? " [inplace]" : "");
@@ -605,7 +607,7 @@ static void mremap_move_multiple_vmas_split(unsigned int pattern_seed,
if (tgt_ptr == MAP_FAILED) {
ksft_perror("mmap");
success = false;
- goto out;
+ goto out_unmap_src;
}
if (munmap(tgt_ptr, size)) {
ksft_perror("munmap");
@@ -690,6 +692,7 @@ static void mremap_move_multiple_vmas_split(unsigned int pattern_seed,
out_unmap:
munmap(tgt_ptr, size);
+out_unmap_src:
munmap(ptr, size);
out:
ksft_test_result(success, "%s%s\n", test_name, dont_unmap ? " [dontunmap]" : "");
@@ -738,7 +741,7 @@ static void mremap_move_multi_invalid_vmas(FILE *maps_fp,
if (tgt_ptr == MAP_FAILED) {
ksft_perror("mmap");
success = false;
- goto out_close_uffd;
+ goto out_unmap_src;
}
if (munmap(tgt_ptr, size)) {
ksft_perror("munmap");
@@ -910,6 +913,7 @@ static void mremap_move_multi_invalid_vmas(FILE *maps_fp,
out_unmap:
munmap(tgt_ptr, size);
+out_unmap_src:
munmap(ptr, size);
out_close_uffd:
close(uffd);
--
2.53.0
next prev parent reply other threads:[~2026-10-06 9:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-06 9:24 [PATCH v2 00/12] selftests/mm: improve mremap_test Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 01/12] selftests/mm: mremap_test: remove command line options Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 02/12] selftests/mm: mremap_test: drop munmap() checks from cleanup paths Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 03/12] selftests/mm: mremap_test: simplify errno handling Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 04/12] selftests/mm: mremap_test: use kselftest helpers Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 05/12] selftests/mm: mremap_test: skip test when userfaultfd is unavailable Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 06/12] selftests/mm: mremap_test: fail unexpected mremap successes Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 07/12] selftests/mm: mremap_test: fail on data corruption Sarthak Sharma
2026-10-06 9:25 ` Sarthak Sharma [this message]
2026-10-06 9:25 ` [PATCH v2 09/12] selftests/mm: mremap_test: remove perf tests and timing Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 10/12] selftests/mm: mremap_test: replace validation threshold with sampled checks Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 11/12] selftests/mm: mremap_test: replace random data with deterministic pattern Sarthak Sharma
2026-10-06 9:25 ` [PATCH v2 12/12] selftests/mm: mremap_test: strengthen multi VMA validation Sarthak Sharma
2026-10-12 4:50 ` [PATCH v2 00/12] selftests/mm: improve mremap_test Sarthak Sharma
2026-10-12 10:13 ` Lorenzo Stoakes (ARM)
2026-10-12 11:08 ` Sarthak Sharma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261006092511.145776-9-sarthak.sharma@arm.com \
--to=sarthak.sharma@arm.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=david@kernel.org \
--cc=jhubbard@nvidia.com \
--cc=kaleshsingh@google.com \
--cc=liam@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ljs@kernel.org \
--cc=mhocko@suse.com \
--cc=rppt@kernel.org \
--cc=shuah@kernel.org \
--cc=surenb@google.com \
--cc=vbabka@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®