macOS: robustify macOS assembly pipeline #6188
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
When adjusting the size of the SYMTAB section and its parent __LINKEDIT segment, directly compute the new size as the difference between end-of-file and the corresponding offset. Previously, we reconstructed the old file size from the __LINKEDIT segment's start offset and size, and then computed the size delta based on the new file size. The new method is more direct and follows the basic assumption that in the final file with appended CArchive, the SYMTAB section and the __LINKEDIT segment must cover everything up to the end of the file. It also gives us some resilience against the codesign utility on Mac OS 10.13 producing bogus __LINKEDIT sizes when removing the signature from the executable.
Disable signature removal before modifying headers of the collected binaries. Doing so makes the process faster, and avoids potential bugs in the codesign utility (e.g., on Mac OS 10.13).
rokm
added
the
needs backport
bwoodsend
approved these changes
Sep 4, 2021
rokm
added a commit
that referenced
this pull request
Sep 4, 2021
* osxutils: robustify the fix_exe_for_code_signing When adjusting the size of the SYMTAB section and its parent __LINKEDIT segment, directly compute the new size as the difference between end-of-file and the corresponding offset. Previously, we reconstructed the old file size from the __LINKEDIT segment's start offset and size, and then computed the size delta based on the new file size. The new method is more direct and follows the basic assumption that in the final file with appended CArchive, the SYMTAB section and the __LINKEDIT segment must cover everything up to the end of the file. It also gives us some resilience against the codesign utility on Mac OS 10.13 producing bogus __LINKEDIT sizes when removing the signature from the executable. * building: macOS: disable signature removal when modifying binaries Disable signature removal before modifying headers of the collected binaries. Doing so makes the process faster, and avoids potential bugs in the codesign utility (e.g., on Mac OS 10.13).
rokm
removed
the
needs backport
6 tasks
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Two changes that make our assembly pipeline on macOS a bit more robust to bogus behavior of the
codesignutility on 10.13 High Sierra (which is EOL at this point, but apparently still popular enough), and fix #6167.I think we can live without signature removal when modifying the headers of collected binaries regardless of macOS version, as forced re-sign should take care of invalidated signatures. If this was not the case, we'd probably be seeing issue reports on earlier versions of PyInstaller where users had to do re-signing themselves. So by skipping signature removal we avoid one call to
codesignand one file resizing (which can be problematic on 10.13).The revised segment and section size computation is more direct, and allows us to compensate for oddities with 10.13 codesign when removing signature from bootloader executable. It is also more consistent with slice size adjustment that we do for fat binaries at the end of that function.