[compiler-rt] 2ee36d4 - [compiler-rt][rtsan] Fix sendmmsg and recvmmsg rtsan interceptor for MUSL (#123907)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 22 01:18:22 PST 2025
Author: Yi Kong
Date: 2025-01-22T18:18:18+09:00
New Revision: 2ee36d40f0e717dc005fde19aa62f1acaaa04528
URL: https://github.com/llvm/llvm-project/commit/2ee36d40f0e717dc005fde19aa62f1acaaa04528
DIFF: https://github.com/llvm/llvm-project/commit/2ee36d40f0e717dc005fde19aa62f1acaaa04528.diff
LOG: [compiler-rt][rtsan] Fix sendmmsg and recvmmsg rtsan interceptor for MUSL (#123907)
MUSL have different signatures for sendmmsg and recvmmsg.
This fixes build breakage from #123484.
Added:
Modified:
compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
Removed:
################################################################################
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index 112191f52648e7..008cc676a6ae55 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -894,8 +894,13 @@ INTERCEPTOR(ssize_t, sendmsg, int socket, const struct msghdr *message,
}
#if SANITIZER_INTERCEPT_SENDMMSG
+#if SANITIZER_MUSL
+INTERCEPTOR(int, sendmmsg, int socket, struct mmsghdr *message,
+ unsigned int len, unsigned int flags) {
+#else
INTERCEPTOR(int, sendmmsg, int socket, struct mmsghdr *message,
unsigned int len, int flags) {
+#endif
__rtsan_notify_intercepted_call("sendmmsg");
return REAL(sendmmsg)(socket, message, len, flags);
}
@@ -927,7 +932,10 @@ INTERCEPTOR(ssize_t, recvmsg, int socket, struct msghdr *message, int flags) {
}
#if SANITIZER_INTERCEPT_RECVMMSG
-#if defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ < 21
+#if SANITIZER_MUSL
+INTERCEPTOR(int, recvmmsg, int socket, struct mmsghdr *message,
+ unsigned int len, unsigned int flags, struct timespec *timeout) {
+#elif defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ < 21
INTERCEPTOR(int, recvmmsg, int socket, struct mmsghdr *message,
unsigned int len, int flags, const struct timespec *timeout) {
#else
More information about the llvm-commits
mailing list