Enable LVI hardening for x86_64-fortanix-unknown-sgx #72655

jethrogb · 2020-05-27T14:37:48Z

This implements mitigations for the Load Value Injection vulnerability (CVE-2020-0551) for the x86_64-fortanix-unknown-sgx target by enabling new LLVM passes. More information about LVI and mitigations may be found at https://software.intel.com/security-software-guidance/insights/deep-dive-load-value-injection.

This PR unconditionally enables the mitigations for x86_64-fortanix-unknown-sgx since there is no available hardware that doesn't require the mitigations. This may be reconsidered in the future.

This depends on Manually patch ret instruction for LVI compiler-builtins#359

rust-highfive · 2020-05-27T14:37:52Z

r? @kennytm

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

rust-highfive · 2020-05-27T14:37:53Z

⚠️ Warning ⚠️

These commits modify submodules.

jethrogb · 2020-05-27T14:41:52Z

cc @raoulstrackx

jethrogb · 2020-05-27T14:42:54Z

src/ci/docker/dist-various-2/Dockerfile

+    AR_x86_64_fortanix_unknown_sgx=ar \
+    CC_x86_64_fortanix_unknown_sgx=x86_64-fortanix-unknown-sgx-clang-11 \
+    CFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
+    CXX_x86_64_fortanix_unknown_sgx=x86_64-fortanix-unknown-sgx-clang++-11 \
+    CXXFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \


This whole block is moved from below so the variables are available for the target-specific build scripts as well. These are the only changed (added) lines

jethrogb · 2020-05-27T14:44:25Z

src/bootstrap/cc_detect.rs

@@ -37,7 +37,9 @@ use crate::{Build, GitRepo};
 // try to infer the archiver path from the C compiler path.
 // In the future this logic should be replaced by calling into the `cc` crate.
 fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> {


I don't think the default that this falls back to (without checking for existence) is good. But I don't want to change it because it might break things.

jethrogb · 2020-05-27T14:48:26Z

src/ci/docker/dist-various-2/Dockerfile

 # We pass the commit id of the port of LLVM's libunwind to the build script.
 # Any update to the commit id here, should cause the container image to be re-built from this point on.
-RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "5125c169b30837208a842f85f7ae44a83533bd0e"
+RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "800f95131fe6acd20b96b6f4723ca3c820f3d379"


This is https://github.com/fortanix/llvm-project/tree/release/5.x/libunwind

jethrogb · 2020-05-27T16:15:29Z

It's not clear to me that the tools CI failure is related to this PR?

jethrogb · 2020-05-27T17:51:24Z

@matthiaskrgr confirms on Discord:

it is unrelated to the llvm pr

jethrogb · 2020-06-02T10:37:11Z

This is fixing a known public security vulnerability, can this please be reviewed?

kennytm · 2020-06-02T19:01:09Z

r? @petrochenkov

petrochenkov · 2020-06-02T19:34:06Z

I'm going to rubber stamp the SGX changes since they are target-specific and you are the maintainer, and all other changes look reasonable.
@bors r+

bors · 2020-06-02T19:34:07Z

📌 Commit d3c41f4d4595feabf0a1d89b37c993e91fd014d3 has been approved by petrochenkov

bors · 2020-06-04T08:32:40Z

⌛ Testing commit d3c41f4d4595feabf0a1d89b37c993e91fd014d3 with merge 47ae8ce37c58482460bca3b853e99d69ccf36d22...

bors · 2020-06-04T08:48:42Z

💔 Test failed - checks-azure

jethrogb · 2020-06-04T11:02:01Z

[TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-apple-darwin" }, target: "x86_64-apple-darwin", tool: "rustbook", path: "src/tools/rustbook", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 399.149
Rustbook (x86_64-apple-darwin) - unstable-book


command did not execute successfully: "/Users/runner/runners/2.169.1/work/1/s/build/x86_64-apple-darwin/stage0-tools-bin/rustbook" "build" "/Users/runner/runners/2.169.1/work/1/s/build/x86_64-apple-darwin/md-doc/unstable-book" "-d" "/Users/runner/runners/2.169.1/work/1/s/build/x86_64-apple-darwin/doc/unstable-book"
expected success, got: signal: 9

No idea what's wrong here but seems unrelated to this PR?

petrochenkov · 2020-06-04T11:38:14Z

@bors retry

bors · 2020-06-07T10:07:40Z

☔ The latest upstream changes (presumably #73072) made this pull request unmergeable. Please resolve the merge conflicts.

jethrogb · 2020-06-07T10:13:45Z

Rebased. This security fix has been in the build queue for 5 days. Could you please assign priority?

kennytm · 2020-06-07T11:14:26Z

@bors r=petrochenkov

bors · 2020-06-07T11:14:27Z

📌 Commit ea48f2e has been approved by petrochenkov

pietroalbini · 2020-06-08T11:00:41Z

@bors p=1

bors · 2020-06-08T12:15:00Z

⌛ Testing commit ea48f2e with merge 99bb1948c80f16efdc2ccc0e6da70a2181ddac40...

Dylan-DPC-zz · 2020-06-08T12:15:34Z

@bors retry yield

bors · 2020-06-08T20:10:13Z

⌛ Testing commit ea48f2e with merge fd4b177...

bors · 2020-06-08T23:51:57Z

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing fd4b177 to master...

rust-highfive assigned kennytm May 27, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2020

jethrogb mentioned this pull request May 27, 2020

Manually patch ret instruction for LVI rust-lang/compiler-builtins#359

Merged

jethrogb commented May 27, 2020

View reviewed changes

jethrogb force-pushed the sgx-lvi-hardening branch from baaca6b to 94207d5 Compare May 27, 2020 14:57

jethrogb mentioned this pull request May 27, 2020

[TEST] Update LLVM module #72663

Closed

jethrogb force-pushed the sgx-lvi-hardening branch from 94207d5 to d3c41f4 Compare June 2, 2020 06:34

rust-highfive assigned petrochenkov and unassigned kennytm Jun 2, 2020

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 Jun 2, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 4, 2020

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 Jun 4, 2020

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 7, 2020

Enable LVI hardening for x86_64-fortanix-unknown-sgx

ea48f2e

jethrogb force-pushed the sgx-lvi-hardening branch from d3c41f4 to ea48f2e Compare June 7, 2020 10:13

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 7, 2020

jethrogb mentioned this pull request Jun 8, 2020

Fortanix SGX target libunwind build process changes #72937

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2020

bors merged commit fd4b177 into rust-lang:master Jun 8, 2020

bors mentioned this pull request Jun 8, 2020

build dist for x86_64-unknown-illumos #71272

Merged

tarcieri mentioned this pull request Jun 9, 2020

SGX as a signing provider iqlusioninc/tmkms#53

Closed

clauverjat mentioned this pull request Feb 23, 2023

Consider disabling LVI mitigations in the x86_64-fortanix-unknown-sgx target #108414

Open

workingjubilee added the O-SGX Target: SGX label Jul 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable LVI hardening for x86_64-fortanix-unknown-sgx #72655

Enable LVI hardening for x86_64-fortanix-unknown-sgx #72655

jethrogb commented May 27, 2020 •

edited

rust-highfive commented May 27, 2020

rust-highfive commented May 27, 2020

jethrogb commented May 27, 2020

jethrogb May 27, 2020

jethrogb May 27, 2020

jethrogb May 27, 2020

jethrogb commented May 27, 2020

jethrogb commented May 27, 2020

jethrogb commented Jun 2, 2020

kennytm commented Jun 2, 2020

petrochenkov commented Jun 2, 2020

bors commented Jun 2, 2020

bors commented Jun 4, 2020

bors commented Jun 4, 2020

jethrogb commented Jun 4, 2020

petrochenkov commented Jun 4, 2020

bors commented Jun 7, 2020

jethrogb commented Jun 7, 2020

kennytm commented Jun 7, 2020

bors commented Jun 7, 2020

pietroalbini commented Jun 8, 2020

bors commented Jun 8, 2020

Dylan-DPC-zz commented Jun 8, 2020

bors commented Jun 8, 2020

bors commented Jun 8, 2020

Enable LVI hardening for x86_64-fortanix-unknown-sgx #72655

Enable LVI hardening for x86_64-fortanix-unknown-sgx #72655

Conversation

jethrogb commented May 27, 2020 • edited

rust-highfive commented May 27, 2020

rust-highfive commented May 27, 2020

jethrogb commented May 27, 2020

jethrogb May 27, 2020

Choose a reason for hiding this comment

jethrogb May 27, 2020

Choose a reason for hiding this comment

jethrogb May 27, 2020

Choose a reason for hiding this comment

jethrogb commented May 27, 2020

jethrogb commented May 27, 2020

jethrogb commented Jun 2, 2020

kennytm commented Jun 2, 2020

petrochenkov commented Jun 2, 2020

bors commented Jun 2, 2020

bors commented Jun 4, 2020

bors commented Jun 4, 2020

jethrogb commented Jun 4, 2020

petrochenkov commented Jun 4, 2020

bors commented Jun 7, 2020

jethrogb commented Jun 7, 2020

kennytm commented Jun 7, 2020

bors commented Jun 7, 2020

pietroalbini commented Jun 8, 2020

bors commented Jun 8, 2020

Dylan-DPC-zz commented Jun 8, 2020

bors commented Jun 8, 2020

bors commented Jun 8, 2020

jethrogb commented May 27, 2020 •

edited