From 934140a3353f6d480a01a1f68d42899c926ee056 Mon Sep 17 00:00:00 2001 From: Chris Apple Date: Wed, 20 Nov 2024 08:27:58 -0800 Subject: [PATCH] [rtsan] Remove mkfifoat interceptor (#116997) This partially reverts #116915 [fce917d](https://github.com/llvm/llvm-project/commit/fce917d39d97b8697e04fc52b1727307fc341212) mkfifoat was improperly guarded against in MacOS systems --- compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp | 11 ----------- .../lib/rtsan/tests/rtsan_test_interceptors_posix.cpp | 15 --------------- 2 files changed, 26 deletions(-) diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp index 5ef52d72fceb..73448cfc1178 100644 --- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp +++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp @@ -746,16 +746,6 @@ INTERCEPTOR(int, mkfifo, const char *pathname, mode_t mode) { return REAL(mkfifo)(pathname, mode); } -// see comment above about -Wunguarded-availability-new -// and why we disable it here -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunguarded-availability-new" -INTERCEPTOR(int, mkfifoat, int dirfd, const char *pathname, mode_t mode) { - __rtsan_notify_intercepted_call("mkfifoat"); - return REAL(mkfifoat)(dirfd, pathname, mode); -} -#pragma clang diagnostic pop - // Preinit void __rtsan::InitializeInterceptors() { INTERCEPT_FUNCTION(calloc); @@ -859,7 +849,6 @@ void __rtsan::InitializeInterceptors() { INTERCEPT_FUNCTION(pipe); INTERCEPT_FUNCTION(mkfifo); - INTERCEPT_FUNCTION(mkfifoat); } #endif // SANITIZER_POSIX 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 72f6d819b216..3e14346f33c7 100644 --- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp +++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp @@ -971,21 +971,6 @@ TEST(TestRtsanInterceptors, MkfifoDiesWhenRealtime) { ExpectNonRealtimeSurvival(Func); } -#if __has_builtin(__builtin_available) && SANITIZER_APPLE -#define MKFIFOAT_AVAILABLE() (__builtin_available(macOS 10.13, *)) -#else -// We are going to assume this is true until we hit systems where it isn't -#define MKFIFOAT_AVAILABLE() (true) -#endif - -TEST(TestRtsanInterceptors, MkfifoatDiesWhenRealtime) { - if (MKFIFOAT_AVAILABLE()) { - auto Func = []() { mkfifoat(0, "/tmp/rtsan_test_fifo", 0); }; - ExpectRealtimeDeath(Func, "mkfifoat"); - ExpectNonRealtimeSurvival(Func); - } -} - TEST(TestRtsanInterceptors, PipeDiesWhenRealtime) { int fds[2]; auto Func = [&fds]() { pipe(fds); }; -- 2.11.4.GIT