Fix LVI tests after frame pointers are enabled by default #121683
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
|
rustbot has assigned @Mark-Simulacrum. Use r? to explicitly pick a reviewer |
rustbot
added
the
S-waiting-on-review
|
r? @cuviper since you reviewed some (all?) of these LVI tests. Could you take a look? |
|
I can take this one, but I don't really want to be the "LVI" guy in general, rather let the review rotation spread it out. Note that the global default for |
raoulstrackx
force-pushed
the
raoul/lvi_fixes
branch
from
210130a
to
5fdc9bd
Compare
This comment has been minimized.
This comment has been minimized.
raoulstrackx
force-pushed
the
raoul/lvi_fixes
branch
from
5fdc9bd
to
9d63441
Compare
Good catch! I've updated the test. Unfortunately, I didn't find a way to express that we're only interested in the last |
On a related note: what's the config of the nightly compilers being build? |
CI builds don't use any of the bootstrap profiles, just a heap of |
cuviper
reviewed
Mar 1, 2024
Comment on lines
52
to
53
| check 'std::io::stdio::_print::[[:alnum:]] ' print.with_frame_pointes.checks || | ||
| check 'std::io::stdio::_print::[[:alnum:]] ' print.without_frame_pointes.checks |
There was a problem hiding this comment.
Suggested change
| check 'std::io::stdio::_print::[[:alnum:]] ' print.with_frame_pointes.checks || | |
| check 'std::io::stdio::_print::[[:alnum:]] ' print.without_frame_pointes.checks | |
| check 'std::io::stdio::_print::[[:alnum:]] ' print.with_frame_pointers.checks || | |
| check 'std::io::stdio::_print::[[:alnum:]] ' print.without_frame_pointers.checks |
There was a problem hiding this comment.
Oh good catch! I was under the impression that the script would fail if if referenced a file that didn't exist. There's the set -e option at line 2, but that doesn't work well with sh. I already filed #121685 last week to clean up this script. It also changes the shell to bash. I've only updated the filenames here.
raoulstrackx
force-pushed
the
raoul/lvi_fixes
branch
from
9d63441
to
ede25ad
Compare
|
@bors r rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 4, 2024
Fix LVI tests after frame pointers are enabled by default rust-lang#121203 enables frame pointers by default. This affects LVI mitigations for the `x86_64-fortanix-unknown-sgx` target. LVI remained mitigated correctly, but the tests were too strict. `@nshyrei` , `@jethrogb`
This was referenced Mar 4, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 4, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#120976 (constify a couple thread_local statics) - rust-lang#121683 (Fix LVI tests after frame pointers are enabled by default) - rust-lang#121703 (Add a way to add constructors for `rustc_type_ir` types) - rust-lang#121732 (Improve assert_matches! documentation) - rust-lang#121928 (Extract an arguments struct for `Builder::then_else_break`) - rust-lang#121939 (Small enhancement to description of From trait) - rust-lang#121968 (Don't run test_get_os_named_thread on win7) - rust-lang#121969 (`ParseSess` cleanups) - rust-lang#121977 (Doc: Fix incorrect reference to integer in Atomic{Ptr,Bool}::as_ptr.) - rust-lang#121994 (Update platform-support.md with supported musl version) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 4, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#120976 (constify a couple thread_local statics) - rust-lang#121683 (Fix LVI tests after frame pointers are enabled by default) - rust-lang#121703 (Add a way to add constructors for `rustc_type_ir` types) - rust-lang#121732 (Improve assert_matches! documentation) - rust-lang#121928 (Extract an arguments struct for `Builder::then_else_break`) - rust-lang#121939 (Small enhancement to description of From trait) - rust-lang#121968 (Don't run test_get_os_named_thread on win7) - rust-lang#121969 (`ParseSess` cleanups) - rust-lang#121977 (Doc: Fix incorrect reference to integer in Atomic{Ptr,Bool}::as_ptr.) - rust-lang#121994 (Update platform-support.md with supported musl version) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 5, 2024
Rollup merge of rust-lang#121683 - fortanix:raoul/lvi_fixes, r=cuviper Fix LVI tests after frame pointers are enabled by default rust-lang#121203 enables frame pointers by default. This affects LVI mitigations for the `x86_64-fortanix-unknown-sgx` target. LVI remained mitigated correctly, but the tests were too strict. ``@nshyrei`` , ``@jethrogb``
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 9, 2024
…est_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Mar 10, 2024
…est_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 10, 2024
…est_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 10, 2024
…est_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Mar 10, 2024
…est_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 10, 2024
…est_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 10, 2024
Rollup merge of rust-lang#121685 - fortanix:raoul/shellcheck_on_lvi_test_script, r=Mark-Simulacrum Fixing shellcheck comments on lvi test script Running `shellcheck` on `tests/run-make/x86_64-fortanix-unknown-sgx-lvi/script.sh` gives plenty of warnings. This PR fixes those issues. For completeness: rust-lang#121683 fixes another warning as well
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.
#121203 enables frame pointers by default. This affects LVI mitigations for the
x86_64-fortanix-unknown-sgxtarget. LVI remained mitigated correctly, but the tests were too strict.@nshyrei , @jethrogb