This is a note to let you know that I've just added the patch titled Revert "selftest/vm: verify mmap addr 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-mmap-addr-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:42 +0000 Subject: Revert "selftest/vm: verify mmap addr in mremap_test" To: gregkh@xxxxxxxxxxxxxxxxxxx Cc: sidhartha.kumar@xxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Oleksandr Tymoshenko <ovt@xxxxxxxxxx> Message-ID: <20220715231542.2169650-3-ovt@xxxxxxxxxx> From: Oleksandr Tymoshenko <ovt@xxxxxxxxxx> This reverts commit e8b9989597daac896b3400b7005f24bf15233d9a. The upstream commit 9c85a9bae267 ("selftest/vm: verify mmap addr in mremap_test") was backported as commit a17404fcbfd0 ("selftest/vm: verify mmap addr in mremap_test"). Repeated backport introduced the duplicate of function get_mmap_min_addr to the file breakign the vm selftest build. Fixes: e8b9989597da ("selftest/vm: verify mmap addr 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 | 29 ----------------------------- 1 file changed, 29 deletions(-) --- a/tools/testing/selftests/vm/mremap_test.c +++ b/tools/testing/selftests/vm/mremap_test.c @@ -66,35 +66,6 @@ enum { .expect_failure = should_fail \ } -/* Returns mmap_min_addr sysctl tunable from procfs */ -static unsigned long long get_mmap_min_addr(void) -{ - FILE *fp; - int n_matched; - static unsigned long long addr; - - if (addr) - return addr; - - fp = fopen("/proc/sys/vm/mmap_min_addr", "r"); - if (fp == NULL) { - ksft_print_msg("Failed to open /proc/sys/vm/mmap_min_addr: %s\n", - strerror(errno)); - exit(KSFT_SKIP); - } - - n_matched = fscanf(fp, "%llu", &addr); - if (n_matched != 1) { - ksft_print_msg("Failed to read /proc/sys/vm/mmap_min_addr: %s\n", - strerror(errno)); - fclose(fp); - exit(KSFT_SKIP); - } - - fclose(fp); - return addr; -} - /* * Returns false if the requested remap region overlaps with an * existing mapping (e.g text, stack) else returns true. 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