-
Notifications
You must be signed in to change notification settings - Fork 13.5k
[compiler-rt][sanitizer] fix msghdr for musl #136195
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Deák Lajos (deaklajos) ChangesRan into the issue on Alpine when building with TSAN that Full diff: https://github.com/llvm/llvm-project/pull/136195.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 348bb4f27aec3..899bd22bbd309 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -476,6 +476,39 @@ struct __sanitizer_cmsghdr {
int cmsg_level;
int cmsg_type;
};
+#elif SANITIZER_MUSL
+struct __sanitizer_msghdr {
+ void *msg_name;
+ unsigned msg_namelen;
+ struct __sanitizer_iovec *msg_iov;
+# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
+ int __pad1;
+# endif
+ int msg_iovlen;
+# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
+ int __pad1;
+# endif
+ void *msg_control;
+# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
+ int __pad2;
+# endif
+ unsigned msg_controllen;
+# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
+ int __pad2;
+# endif
+ int msg_flags;
+};
+struct __sanitizer_cmsghdr {
+# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
+ int __pad1;
+# endif
+ unsigned cmsg_len;
+# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
+ int __pad1;
+# endif
+ int cmsg_level;
+ int cmsg_type;
+};
#else
// In POSIX, int msg_iovlen; socklen_t msg_controllen; socklen_t cmsg_len; but
// many implementations don't conform to the standard.
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
3ffdd1e
to
d92515d
Compare
d92515d
to
6a29777
Compare
void *msg_name; | ||
unsigned msg_namelen; | ||
struct __sanitizer_iovec *msg_iov; | ||
# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you use SANITIZER_WORDSIZE == 64
instead of __LONG_MAX ?
# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN | ||
int __pad1; | ||
# endif | ||
int msg_iovlen; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think big endian is realy supported.
Let's assume little endian.
# endif | ||
int msg_iovlen; | ||
# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN | ||
int __pad1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you have a link to declaration?
Ran into the issue on Alpine when building with TSAN that
__sanitizer_msghdr
and themsghdr
provided by musl did not match.This caused lots of tsan reports and an eventual termination of the application by the oom during a
sendmsg
.