[compiler-rt][rtsan] Fix recvmmsg rtsan interceptor for glibc < 2.21 #123664
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @Zentrik would you mind trying the build when you get the chance ? |
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: David CARLIER (devnexen) Changeslinux/glibc prior to 2.21 had a different signature for recvmmsg. Full diff: https://github.com/llvm/llvm-project/pull/123664.diff 1 Files Affected:
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index 34c2d4cb37fd0c..2d8ab696835081 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -927,8 +927,13 @@ INTERCEPTOR(ssize_t, recvmsg, int socket, struct msghdr *message, int flags) {
}
#if SANITIZER_INTERCEPT_RECVMMSG
+#if defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ < 21
+INTERCEPTOR(int, recvmmsg, int socket, struct mmsghdr *message,
+ unsigned int len, int flags, const struct timespec *timeout) {
+#else
INTERCEPTOR(int, recvmmsg, int socket, struct mmsghdr *message,
unsigned int len, int flags, struct timespec *timeout) {
+#endif
__rtsan_notify_intercepted_call("recvmmsg");
return REAL(recvmmsg)(socket, message, len, flags, timeout);
}
|
|
Worked for me thanks. |
cjappl
reviewed
Jan 21, 2025
| INTERCEPTOR(int, recvmmsg, int socket, struct mmsghdr *message, | ||
| unsigned int len, int flags, struct timespec *timeout) { | ||
| #endif |
There was a problem hiding this comment.
I would have a comment here saying what this is finishing
#endif defined(GLIBC_MINOR) && GLIBC_MINOR < 21
|
I may have to commit soon some people start to be annoyed. Cheers. |
|
I would prefer a more self contained commit message that doesn't require me to look up another CL. "Fix recvmsg interceptor [..]"? |
|
I think this is fine, because it only cares about build time checks, the ABI should be the same for both versions. |
devnexen
changed the title
devnexen
force-pushed
the
gh123484_fix
branch
from
e5b02db to
e08634b
Compare
linux/glibc prior to 2.21 had a different signature for recvmmsg. Fix llvm#123484
devnexen
force-pushed
the
gh123484_fix
branch
from
e08634b to
c300775
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/12110 Here is the relevant piece of the build log for the reference |
|
This is not sufficient as musl targets are still failing, please look at the issue |
|
Normally should be fixed by #123907 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
linux/glibc prior to 2.21 had a different signature for recvmmsg.