[MachO] Fix unaligned load in extractSections #68741
Merged
Conversation
This file contains 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
A recent change to ubsan (llvm@7926744) exposed an unaligned load in MachOReader (see https://lab.llvm.org/buildbot/#/builders/85/builds/19482 for an example). This patch fixes it by dropping the alignment.
|
@llvm/pr-subscribers-llvm-binary-utilities Author: Thurston Dang (thurstond) ChangesA recent change to ubsan This patch fixes it by dropping the alignment. Full diff: https://github.com/llvm/llvm-project/pull/68741.diff 1 Files Affected:
diff --git a/llvm/lib/ObjCopy/MachO/MachOReader.cpp b/llvm/lib/ObjCopy/MachO/MachOReader.cpp
index 2cbffc12adbf765..9006f9e6d98d951 100644
--- a/llvm/lib/ObjCopy/MachO/MachOReader.cpp
+++ b/llvm/lib/ObjCopy/MachO/MachOReader.cpp
@@ -67,7 +67,7 @@ Expected<std::vector<std::unique_ptr<Section>>> static extractSections(
LoadCmd.C.cmdsize);
Curr < End; ++Curr) {
SectionType Sec;
- memcpy((void *)&Sec, Curr, sizeof(SectionType));
+ memcpy((void *)&Sec, reinterpret_cast<const char*>(Curr), sizeof(SectionType));
if (MachOObj.isLittleEndian() != sys::IsLittleEndianHost)
MachO::swapStruct(Sec);
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
compnerd
approved these changes
Oct 10, 2023
Done, thanks for the reminder! |
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.
A recent change to ubsan
(7926744)
exposed an unaligned load in MachOReader (see
https://lab.llvm.org/buildbot/#/builders/85/builds/19482 for an example).
This patch fixes it by dropping the alignment.