Skip to content

[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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

deaklajos
Copy link

Ran into the issue on Alpine when building with TSAN that __sanitizer_msghdr and the msghdr 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.

Copy link

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 @ followed by their GitHub username.

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.

@llvmbot
Copy link
Member

llvmbot commented Apr 17, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Deák Lajos (deaklajos)

Changes

Ran into the issue on Alpine when building with TSAN that __sanitizer_msghdr and the msghdr 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.


Full diff: https://github.com/llvm/llvm-project/pull/136195.diff

1 Files Affected:

  • (modified) compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h (+33)
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.

Copy link

github-actions bot commented Apr 17, 2025

✅ With the latest revision this PR passed the C/C++ code formatter.

@deaklajos deaklajos force-pushed the compiler-rt/musl-msghdr branch from 3ffdd1e to d92515d Compare April 22, 2025 14:55
@deaklajos deaklajos force-pushed the compiler-rt/musl-msghdr branch from d92515d to 6a29777 Compare April 22, 2025 15:01
void *msg_name;
unsigned msg_namelen;
struct __sanitizer_iovec *msg_iov;
# if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
Copy link
Collaborator

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;
Copy link
Collaborator

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;
Copy link
Collaborator

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants