Skip to contentSkip to conversation

selftests-mm-virtual_address_range-avoid-reading-from-vm_io-mappings.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 20, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests/mm: virtual_address_range: avoid reading from VM_IO mappings
has been removed from the -mm tree. Its filename was
selftests-mm-virtual_address_range-avoid-reading-from-vm_io-mappings.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Thomas Weißschuh <[email protected]>
Subject: selftests/mm: virtual_address_range: avoid reading from VM_IO mappings
Date: Tue, 14 Jan 2025 17:06:48 +0100

The virtual_address_range selftest reads from the start of each mapping listed in /proc/self/maps. However not all mappings are valid to be arbitrarily accessed.

For example the vvar data used for virtual clocks on x86 [vvar_vclock] can only be accessed if 1) the kernel configuration enables virtual clocks and
2) the hypervisor provided the data for it. Only the VDSO itself has the necessary information to know this. Since commit e93d2521b27f ("x86/vdso:
Split virtual clock pages into dedicated mapping") the virtual clock data was split out into its own mapping, leading to EFAULT from read() during the validation.

Check for the VM_IO flag as a proxy. It is present for the VVAR mappings and MMIO ranges can be dangerous to access arbitrarily.

Fixes e93d2521b27f ("x86/vdso: Split virtual clock pages into dedicated mapping")
Fixes 010409649885 ("selftests/mm: confirm VA exhaustion without reliance on correctness of mmap()")
Cc Anshuman Khandual <[email protected]>
Cc Dev Jain <[email protected]>
Cc Shuah Khan (Samsung OSG) <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

 tools/testing/selftests/mm/virtual_address_range.c |    4 +
 tools/testing/selftests/mm/vm_util.c               |   24 +++++++++++
 tools/testing/selftests/mm/vm_util.h               |    1 
 3 files changed, 29 insertions(+)
tools/testing/selftests/mm/virtual_address_range.c renamed from tools/testing/selftests/mm/virtual_address_range.c~selftests-mm-virtual_address_range-avoid-reading-from-vm_io-mappings +4 -0
@@ -15,6 +15,7 @@
 #include <sys/time.h>
 #include <fcntl.h>
 
+#include "vm_util.h"
 #include "../kselftest.h"
 
 /*
@@ -159,6 +160,9 @@ static int validate_complete_va_space(vo
 		if (prot[0] != 'r')
 			continue;
 
+		if (check_vmflag_io((void *)start_addr))
+			continue;
+
 		/*
 		 * Confirm whether MAP_CHUNK_SIZE chunk can be found or not.
 		 * If write succeeds, no need to check MAP_CHUNK_SIZE - 1
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~selftests-mm-virtual_address_range-avoid-reading-from-vm_io-mappings +24 -0
@@ -400,3 +400,27 @@ unsigned long get_free_hugepages(void)
 	fclose(f);
 	return fhp;
 }
+
+bool check_vmflag_io(void *addr)
+{
+	char buffer[MAX_LINE_LENGTH];
+	const char *flags;
+	size_t flaglen;
+
+	flags = __get_smap_entry(addr, "VmFlags:", buffer, sizeof(buffer));
+	if (!flags)
+		ksft_exit_fail_msg("%s: No VmFlags for %p\n", __func__, addr);
+
+	while (true) {
+		flags += strspn(flags, " ");
+
+		flaglen = strcspn(flags, " ");
+		if (!flaglen)
+			return false;
+
+		if (flaglen == strlen("io") && !memcmp(flags, "io", flaglen))
+			return true;
+
+		flags += flaglen;
+	}
+}
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-virtual_address_range-avoid-reading-from-vm_io-mappings +1 -0
@@ -53,6 +53,7 @@ int uffd_unregister(int uffd, void *addr
 int uffd_register_with_ioctls(int uffd, void *addr, uint64_t len,
 			      bool miss, bool wp, bool minor, uint64_t *ioctls);
 unsigned long get_free_hugepages(void);
+bool check_vmflag_io(void *addr);
 
 /*
  * On ppc64 this will only work with radix 2M hugepage size

_

Patches currently in -mm which might be from [email protected] are