[compiler-rt] [compiler-rt][rtsan] Fix madvise/posix_madvise for macOs. (PR #124020)
David CARLIER via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 22 14:25:38 PST 2025
https://github.com/devnexen updated https://github.com/llvm/llvm-project/pull/124020
>From 050f46498d51ca4b78187b60c3573be67c8d65c4 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Wed, 22 Jan 2025 22:19:41 +0000
Subject: [PATCH] [compiler-rt][rtsan] Fix madvise/posix_madvise for macOs.
only bsd and linux intercept these syscalls.
Fix #123601
---
compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp | 11 +++++++++--
.../lib/rtsan/tests/rtsan_test_interceptors_posix.cpp | 6 +++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index 71938d3edba38d..a9812f90dec079 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -808,6 +808,7 @@ INTERCEPTOR(int, munmap, void *addr, size_t length) {
return REAL(munmap)(addr, length);
}
+#if !SANITIZER_APPLE
INTERCEPTOR(int, madvise, void *addr, size_t length, int flag) {
__rtsan_notify_intercepted_call("madvise");
return REAL(madvise)(addr, length, flag);
@@ -817,6 +818,12 @@ INTERCEPTOR(int, posix_madvise, void *addr, size_t length, int flag) {
__rtsan_notify_intercepted_call("posix_madvise");
return REAL(posix_madvise)(addr, length, flag);
}
+#define RTSAN_MAYBE_INTERCEPT_MADVISE INTERCEPT_FUNCTION(madvise)
+#define RTSAN_MAYBE_INTERCEPT_POSIX_MADVISE INTERCEPT_FUNCTION(posix_madvise)
+#else
+#define RTSAN_MAYBE_INTERCEPT_MADVISE
+#define RTSAN_MAYBE_INTERCEPT_POSIX_MADVISE
+#endif
INTERCEPTOR(int, mprotect, void *addr, size_t length, int prot) {
__rtsan_notify_intercepted_call("mprotect");
@@ -1216,8 +1223,8 @@ void __rtsan::InitializeInterceptors() {
INTERCEPT_FUNCTION(mmap);
RTSAN_MAYBE_INTERCEPT_MMAP64;
INTERCEPT_FUNCTION(munmap);
- INTERCEPT_FUNCTION(madvise);
- INTERCEPT_FUNCTION(posix_madvise);
+ RTSAN_MAYBE_INTERCEPT_MADVISE;
+ RTSAN_MAYBE_INTERCEPT_POSIX_MADVISE;
INTERCEPT_FUNCTION(mprotect);
INTERCEPT_FUNCTION(msync);
INTERCEPT_FUNCTION(mincore);
diff --git a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
index 0a59ae0ea92548..23b1728c7a4594 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
@@ -238,6 +238,7 @@ class RtsanOpenedMmapTest : public RtsanFileTest {
int fd = -1;
};
+#if !SANITIZER_APPLE
TEST_F(RtsanOpenedMmapTest, MadviseDiesWhenRealtime) {
auto Func = [this]() { madvise(GetAddr(), GetSize(), MADV_NORMAL); };
ExpectRealtimeDeath(Func, "madvise");
@@ -245,10 +246,13 @@ TEST_F(RtsanOpenedMmapTest, MadviseDiesWhenRealtime) {
}
TEST_F(RtsanOpenedMmapTest, PosixMadviseDiesWhenRealtime) {
- auto Func = [this]() { posix_madvise(GetAddr(), GetSize(), MADV_NORMAL); };
+ auto Func = [this]() {
+ posix_madvise(GetAddr(), GetSize(), POSIX_MADV_NORMAL);
+ };
ExpectRealtimeDeath(Func, "posix_madvise");
ExpectNonRealtimeSurvival(Func);
}
+#endif
TEST_F(RtsanOpenedMmapTest, MprotectDiesWhenRealtime) {
auto Func = [this]() { mprotect(GetAddr(), GetSize(), PROT_READ); };
More information about the llvm-commits
mailing list