All of lore.kernel.org
 help / color / mirror / Atom feed
* [to-be-updated] tools-mm-check-mmap-based-on-return-values.patch removed from -mm tree
@ 2024-09-04  3:41 Andrew Morton
  0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2024-09-04  3:41 UTC (permalink / raw)
  To: mm-commits, shuah, 11162571, akpm


The quilt patch titled
     Subject: tools:mm: check mmap based on return values
has been removed from the -mm tree.  Its filename was
     tools-mm-check-mmap-based-on-return-values.patch

This patch was dropped because an updated version will be issued

------------------------------------------------------
From: Yang Ruibin <11162571@vivo.com>
Subject: tools:mm: check mmap based on return values
Date: Tue, 20 Aug 2024 23:50:03 -0400

To correctly detect whether mmap is successful, must use if (map_ptr ==
MAP_FAILED)to avoid incorrectly handling a valid mapping.

Link: https://lkml.kernel.org/r/20240821035005.4423-1-11162571@vivo.com
Signed-off-by: Yang Ruibin <11162571@vivo.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 tools/testing/selftests/mm/ksm_tests.c     |    2 +-
 tools/testing/selftests/mm/madv_populate.c |    2 +-
 tools/testing/selftests/mm/soft-dirty.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- a/tools/testing/selftests/mm/ksm_tests.c~tools-mm-check-mmap-based-on-return-values
+++ a/tools/testing/selftests/mm/ksm_tests.c
@@ -201,7 +201,7 @@ static void  *allocate_memory(void *ptr,
 {
 	void *map_ptr = mmap(ptr, map_size, PROT_WRITE, mapping, -1, 0);
 
-	if (!map_ptr) {
+	if (map_ptr == MAP_FAILED) {
 		perror("mmap");
 		return NULL;
 	}
--- a/tools/testing/selftests/mm/madv_populate.c~tools-mm-check-mmap-based-on-return-values
+++ a/tools/testing/selftests/mm/madv_populate.c
@@ -34,7 +34,7 @@ static void sense_support(void)
 
 	addr = mmap(0, pagesize, PROT_READ | PROT_WRITE,
 		    MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
-	if (!addr)
+	if (addr == MAP_FAILED)
 		ksft_exit_fail_msg("mmap failed\n");
 
 	ret = madvise(addr, pagesize, MADV_POPULATE_READ);
--- a/tools/testing/selftests/mm/soft-dirty.c~tools-mm-check-mmap-based-on-return-values
+++ a/tools/testing/selftests/mm/soft-dirty.c
@@ -134,7 +134,7 @@ static void test_mprotect(int pagemap_fd
 	if (anon) {
 		map = mmap(NULL, pagesize, PROT_READ|PROT_WRITE,
 			   MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
-		if (!map)
+		if (map == MAP_FAILED)
 			ksft_exit_fail_msg("anon mmap failed\n");
 	} else {
 		test_fd = open(fname, O_RDWR | O_CREAT, 0664);
_

Patches currently in -mm which might be from 11162571@vivo.com are



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-09-04  3:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-04  3:41 [to-be-updated] tools-mm-check-mmap-based-on-return-values.patch removed from -mm tree Andrew Morton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.