Merge pull request intel#2402 from yingcong-wu/yc/1202-mmap-failure

aarongreig · web-flow · commit 93fc1331edfd · 2024-12-26T16:52:33.000Z
[DevASAN][CPU] bugfix for mmap return value check.
diff --git a/source/loader/layers/sanitizer/sanitizer_common/linux/sanitizer_utils.cpp b/source/loader/layers/sanitizer/sanitizer_common/linux/sanitizer_utils.cpp
@@ -40,6 +40,9 @@ uptr MmapNoReserve(uptr Addr, uptr Size) {
     Addr = RoundDownTo(Addr, EXEC_PAGESIZE);
     void *P = mmap((void *)Addr, Size, PROT_READ | PROT_WRITE,
                    MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS, -1, 0);
+    if (P == MAP_FAILED) {
+        return 0;
+    }
     return (uptr)P;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,9 @@ uptr MmapNoReserve(uptr Addr, uptr Size) {`
`40`	`40`	`Addr = RoundDownTo(Addr, EXEC_PAGESIZE);`
`41`	`41`	`void P = mmap((void )Addr, Size, PROT_READ \| PROT_WRITE,`
`42`	`42`	`MAP_PRIVATE \| MAP_NORESERVE \| MAP_ANONYMOUS, -1, 0);`
	`43`	`+ if (P == MAP_FAILED) {`
	`44`	`+ return 0;`
	`45`	`+ }`
`43`	`46`	`return (uptr)P;`
`44`	`47`	`}`
`45`	`48`