-
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
Open
deaklajos
wants to merge
3
commits into
llvm:main
Choose a base branch
from
deaklajos:compiler-rt/musl-msghdr
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -476,7 +476,31 @@ struct __sanitizer_cmsghdr { | |
int cmsg_level; | ||
int cmsg_type; | ||
}; | ||
#else | ||
# elif SANITIZER_MUSL | ||
struct __sanitizer_msghdr { | ||
void *msg_name; | ||
unsigned msg_namelen; | ||
struct __sanitizer_iovec *msg_iov; | ||
int msg_iovlen; | ||
# if SANITIZER_WORDSIZE == 64 | ||
int __pad1; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you have a link to declaration? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You mean for |
||
# endif | ||
void *msg_control; | ||
unsigned msg_controllen; | ||
# if SANITIZER_WORDSIZE == 64 | ||
int __pad2; | ||
# endif | ||
int msg_flags; | ||
}; | ||
struct __sanitizer_cmsghdr { | ||
unsigned cmsg_len; | ||
# if SANITIZER_WORDSIZE == 64 | ||
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. | ||
struct __sanitizer_msghdr { | ||
|
@@ -493,9 +517,9 @@ struct __sanitizer_cmsghdr { | |
int cmsg_level; | ||
int cmsg_type; | ||
}; | ||
#endif | ||
# endif | ||
|
||
#if SANITIZER_LINUX | ||
# if SANITIZER_LINUX | ||
struct __sanitizer_mmsghdr { | ||
__sanitizer_msghdr msg_hdr; | ||
unsigned int msg_len; | ||
|
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.
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.
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.
Removed the big endian code.