Skip to content

Conversation

jethrogb
Copy link
Contributor

Even though re-entry after exit is generally not acceptable, there is a race condition where the enclave thinks it's exited but userspace doesn't know that yet. An entry during that time will currently result in an enclave panic (see #59997 (comment), #60003 (comment)). Instead of panicking, just do a regular exit on re-entry.

cc @jseyfried

@rust-highfive
Copy link
Contributor

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2019
@jethrogb jethrogb force-pushed the jb/sgx-reentry-abort branch from 5f396de to d0a1c2d Compare April 17, 2019 01:18
@cramertj
Copy link
Member

@bors r+ p=1

(giving priority to prevent further other failures)

@bors
Copy link
Collaborator

bors commented Apr 17, 2019

📌 Commit d0a1c2d has been approved by cramertj

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2019
@bors
Copy link
Collaborator

bors commented Apr 17, 2019

⌛ Testing commit d0a1c2d with merge e4e032a...

bors added a commit that referenced this pull request Apr 17, 2019
SGX target: change re-entry abort logic

Even though re-entry after exit is generally not acceptable, there is a race condition where the enclave thinks it's exited but userspace doesn't know that yet. An entry during that time will currently result in an enclave panic (see #59997 (comment), #60003 (comment)). Instead of panicking, just do a regular exit on re-entry.

cc @jseyfried
@bors
Copy link
Collaborator

bors commented Apr 17, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: cramertj
Pushing e4e032a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2019
@bors bors merged commit d0a1c2d into rust-lang:master Apr 17, 2019
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #60027!

Tested on commit e4e032a.
Direct link to PR: #60027

💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 17, 2019
Tested on commit rust-lang/rust@e4e032a.
Direct link to PR: <rust-lang/rust#60027>

💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).
@workingjubilee workingjubilee added the O-SGX Target: SGX label Jul 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. O-SGX Target: SGX S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants