This is a note to let you know that I've just added the patch titled Revert "selftest/vm: verify remap destination address in mremap_test" to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-selftest-vm-verify-remap-destination-address-in-mremap_test.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Sat Jul 23 04:53:32 PM CEST 2022 From: Oleksandr Tymoshenko <ovt@xxxxxxxxxx> Date: Fri, 15 Jul 2022 23:15:41 +0000 Subject: Revert "selftest/vm: verify remap destination address in mremap_test" To: gregkh@xxxxxxxxxxxxxxxxxxx Cc: sidhartha.kumar@xxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Oleksandr Tymoshenko <ovt@xxxxxxxxxx> Message-ID: <20220715231542.2169650-2-ovt@xxxxxxxxxx> From: Oleksandr Tymoshenko <ovt@xxxxxxxxxx> This reverts commit 0b4e16093e081a3ab08b0d6cedf79b249f41b248. The upstream commit 18d609daa546 ("selftest/vm: verify remap destination address in mremap_test") was backported as commit 2688d967ec65 ("selftest/vm: verify remap destination address in mremap_test"). Repeated backport introduced the duplicate of function is_remap_region_valid to the file breakign the vm selftest build. Fixes: 0b4e16093e08 ("selftest/vm: verify remap destination address in mremap_test") Signed-off-by: Oleksandr Tymoshenko <ovt@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/testing/selftests/vm/mremap_test.c | 24 ------------------------ 1 file changed, 24 deletions(-) --- a/tools/testing/selftests/vm/mremap_test.c +++ b/tools/testing/selftests/vm/mremap_test.c @@ -66,30 +66,6 @@ enum { .expect_failure = should_fail \ } -/* - * Returns false if the requested remap region overlaps with an - * existing mapping (e.g text, stack) else returns true. - */ -static bool is_remap_region_valid(void *addr, unsigned long long size) -{ - void *remap_addr = NULL; - bool ret = true; - - /* Use MAP_FIXED_NOREPLACE flag to ensure region is not mapped */ - remap_addr = mmap(addr, size, PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); - - if (remap_addr == MAP_FAILED) { - if (errno == EEXIST) - ret = false; - } else { - munmap(remap_addr, size); - } - - return ret; -} - /* Returns mmap_min_addr sysctl tunable from procfs */ static unsigned long long get_mmap_min_addr(void) { Patches currently in stable-queue which might be from ovt@xxxxxxxxxx are queue-5.15/revert-selftest-vm-verify-remap-destination-address-in-mremap_test.patch queue-5.15/revert-selftest-vm-verify-mmap-addr-in-mremap_test.patch