SGX: Change ELF entrypoint #67084
Merged
SGX: Change ELF entrypoint #67084
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
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Kimundi (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
jethrogb
approved these changes
Dec 6, 2019
bors bot
added a commit
to fortanix/rust-sgx
that referenced
this pull request
Dec 9, 2019
203: elf2sgx: Remove .text_no_sgx section during conversion r=jethrogb a=Pagten This pull request is related to [rust-lang pull request #67084](rust-lang/rust#67084), which places the ELF entry point in a separate section of the ELF file. This pull request removes/overwrites that section during the conversion from ELF to SGXS, because that code is not needed in the enclave. To avoid changing the relative position of other code, the section is only removed if it is at the end of a program segment. It is overwritten with NOPs otherwise. The pull request also includes some general refactoring of the code related to Splices. Co-authored-by: Pieter Agten <[email protected]>
|
r? @Amanieu |
|
@bors r+ |
|
📌 Commit f02ffb8 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Dec 14, 2019
…r=Amanieu SGX: Change ELF entrypoint This fixes [rust-sgx issue #148](fortanix/rust-sgx#148). A new entry point is created for the ELF file generated by `rustc`, separate from the enclave entry point. When the ELF file is executed as a Linux binary, the error message below is written to stderr. > Error: This file is an SGX enclave which cannot be executed as a standard Linux binary. > See the installation guide at https://edp.fortanix.com/docs/installation/guide/ on how to use 'cargo run' or follow the steps at https://edp.fortanix.com/docs/tasks/deployment/ for manual deployment. When the ELF file is converted to an SGXS using `elf2sgxs`, the old entry point is still set as the enclave entry point. In a future pull request in the rust-sgx repository, `elf2sgxs` will be modified to remove the code in the ELF entry point, since this code is not needed in the enclave.
|
☀️ Test successful - checks-azure |
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.
This fixes rust-sgx issue #148.
A new entry point is created for the ELF file generated by
rustc, separate from the enclave entry point. When the ELF file is executed as a Linux binary, the error message below is written to stderr.When the ELF file is converted to an SGXS using
elf2sgxs, the old entry point is still set as the enclave entry point. In a future pull request in the rust-sgx repository,elf2sgxswill be modified to remove the code in the ELF entry point, since this code is not needed in the enclave.