selftest-vm-verify-remap-destination-address-in-mremap_test.patch removed from -mm tree
The patch titled
Subject: selftest/vm: verify remap destination address in mremap_test
has been removed from the -mm tree. Its filename was
selftest-vm-verify-remap-destination-address-in-mremap_test.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Sidhartha Kumar <[email protected]>
Subject: selftest/vm: verify remap destination address in mremap_test
Because mremap does not have a MAP_FIXED_NOREPLACE flag, it can destroy existing mappings. This causes a segfault when regions such as text are remapped and the permissions are changed.
Verify the requested mremap destination address does not overlap any existing mappings by using mmap's MAP_FIXED_NOREPLACE flag. Keep incrementing the destination address until a valid mapping is found or fail the current test once the max address is reached.
---
tools/testing/selftests/vm/mremap_test.c | 42 +++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-)
tools/testing/selftests/vm/mremap_test.c renamed from tools/testing/selftests/vm/mremap_test.c~selftest-vm-verify-remap-destination-address-in-mremap_test +39 -3
@@ -10,6 +10,7 @@#include <string.h> #include <sys/mman.h> #include <time.h> +#include <stdbool.h> #include "../kselftest.h"
@@ -64,6 +65,30 @@ 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 ) {
@@ -111,8 +136,8 @@ retry: goto retry; src_addr =mmap ((void *) addr, c.region_size,PROT_READ |PROT_WRITE , -MAP_FIXED_NOREPLACE |MAP_ANONYMOUS |MAP_SHARED , --1 ,0 ); +MAP_FIXED_NOREPLACE |MAP_ANONYMOUS |MAP_SHARED , +-1 ,0 );if (src_addr ==MAP_FAILED ) {if (errno ==EPERM || errno ==EEXIST ) goto retry;
@@ -179,9 +204,20 @@ static long long remap_region(struct conif (!((unsigned long long ) addr & c.dest_alignment)) addr = (void *) ((unsigned long long ) addr | c.dest_alignment); +/* Don't destroy existing mappings unless expected to overlap */ +while (!is_remap_region_valid (addr, c.region_size) && !c.overlapping) { +/* Check for unsigned overflow */ +if (addr + c.dest_alignment < addr) { +ksft_print_msg ("Couldn't find a valid region to remap to\n" ); + ret =-1 ; + goto out; + } + addr += c.dest_alignment; + } +clock_gettime (CLOCK_MONOTONIC , &t_start); dest_addr =mremap (src_addr, c.region_size, c.region_size, -MREMAP_MAYMOVE |MREMAP_FIXED , (char *) addr); +MREMAP_MAYMOVE |MREMAP_FIXED , (char *) addr);clock_gettime (CLOCK_MONOTONIC , &t_end);if (dest_addr ==MAP_FAILED ) {
_
Patches currently in -mm which might be from [email protected] are
selftest-vm-clarify-error-statement-in-gup_test.patch