Prevent foreign Rust exceptions from being caught #102721

nbdd0121 · 2022-10-05T23:14:37Z

Use the address of a static variable (which is guaranteed to be unique per copy of std) to tell apart if a Rust exception comes from local or foreign Rust code, and abort for the latter.

rustbot · 2022-10-05T23:14:41Z

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

rust-highfive · 2022-10-05T23:14:41Z

r? @m-ou-se

(rust-highfive has picked a reviewer for you, use r? to override)

library/panic_unwind/src/gcc.rs

bjorn3 · 2022-10-06T17:39:26Z

library/panic_unwind/src/emcc.rs

@@ -47,7 +47,12 @@ static EXCEPTION_TYPE_INFO: TypeInfo = TypeInfo {
    name: b"rust_panic\0".as_ptr(),


Maybe change this to avoid unsoundness in combination with older rust versions? Same for the exception type for the other unwinding mechanisms.

I think it's worth mentioning that catching a foreign unwind in Rust is UB. We are providing guards against this but it's not part of guarantee.

Currently there are no ways to hit this on stable, and if you hit this using nightly you are already in UB territory. So we can change this string (and the exception class), but we don't have to.

library/panic_unwind/src/gcc.rs

m-ou-se · 2022-10-11T09:30:00Z

r? @Amanieu

library/panic_unwind/src/gcc.rs

Amanieu · 2022-10-11T17:02:54Z

@bors r+

bors · 2022-10-11T17:02:56Z

📌 Commit c33cef6 has been approved by Amanieu

It is now in the queue for this repository.

Prevent foreign Rust exceptions from being caught Fix rust-lang#102715 Use the address of a static variable (which is guaranteed to be unique per copy of std) to tell apart if a Rust exception comes from local or foreign Rust code, and abort for the latter.

library/panic_unwind/src/emcc.rs

joboet · 2022-10-12T11:22:40Z

I hope I am correct in doing this, but this should probably not be merged with the unsoundness above (I think that also caused the rollup to fail).

@bors r-

bors · 2022-10-12T11:22:41Z

@joboet: 🔑 Insufficient privileges: Not in reviewers

Amanieu · 2022-10-12T14:29:02Z

Nice catch!

@bors r+

bors · 2022-10-12T14:29:04Z

📌 Commit 65c7d94d94e575edc934de5081d674856baf67df has been approved by Amanieu

It is now in the queue for this repository.

bors · 2022-10-13T11:02:38Z

⌛ Testing commit 65c7d94d94e575edc934de5081d674856baf67df with merge d3129761e1defe2e2c5878b84934fa9664e251a7...

bors · 2022-10-13T12:03:38Z

💔 Test failed - checks-actions

Dylan-DPC · 2022-10-25T09:12:46Z

failed in rollup

@bors r-

nbdd0121 · 2022-10-26T21:10:39Z

Hmm, I tested the test case on nightly i686-pc-windows-gnu and it doesn't work either. I am not familiar enough with windows-gnu targets to troubleshoot it, unfortunately.

However, given that the problem is not related to the main PR itself, I'll just mark the test as ignore-windows-gnu. Is that okay? @Amanieu

Amanieu · 2022-10-27T01:16:29Z

i686-mingw requires unwind tables to be registered with the unwinder when the module is loaded. We do this, but the problem in this case is that the cdylib has its own copy of libgcc statically linked into it. This is somewhat by design so that mingw executables don't have a runtime dependency on libgcc_s.dll, but it breaks cross-DLL unwinding since the respective unwinders are not aware of the unwind tables in other modules.

I think ignoring the test is fine in this case, but only on i686. Other architectures do not have this limitation.

nbdd0121 · 2022-10-27T02:08:25Z

I think ignoring the test is fine in this case, but only on i686. Other architectures do not have this limitation.

Yeah, I tested this on x86_64 MinGW and it works fine. However we only have ignore-x86 and ignore-windows-gnu, but not ignore-(x86 and windows-gnu). Which directive should I use?

Amanieu · 2022-10-27T12:14:16Z

You can pass a full target triple: // ignore-i686-pc-windows-gnu

Amanieu · 2022-10-27T17:27:33Z

@bors r+

bors · 2022-10-27T17:27:34Z

📌 Commit bfac2da has been approved by Amanieu

It is now in the queue for this repository.

Prevent foreign Rust exceptions from being caught Fix rust-lang#102715 Use the address of a static variable (which is guaranteed to be unique per copy of std) to tell apart if a Rust exception comes from local or foreign Rust code, and abort for the latter.

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#102634 (compiletest: Refactor test rustcflags) - rust-lang#102721 (Prevent foreign Rust exceptions from being caught) - rust-lang#103415 (filter candidates in pick probe for diagnostics) - rust-lang#103618 (Rename some `OwnerId` fields.) - rust-lang#103625 (Accept `TyCtxt` instead of `TyCtxtAt` in `Ty::is_*` functions) - rust-lang#103653 (Add missing impl blocks for item reexported from private mod in JSON output) - rust-lang#103699 (Emit proper error when casting to `dyn*`) - rust-lang#103719 (fix typo in `try_reserve` method from `HashMap` and `HashSet`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Prevent foreign Rust exceptions from being caught Fix rust-lang#102715 Use the address of a static variable (which is guaranteed to be unique per copy of std) to tell apart if a Rust exception comes from local or foreign Rust code, and abort for the latter.

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#102634 (compiletest: Refactor test rustcflags) - rust-lang#102721 (Prevent foreign Rust exceptions from being caught) - rust-lang#103415 (filter candidates in pick probe for diagnostics) - rust-lang#103618 (Rename some `OwnerId` fields.) - rust-lang#103625 (Accept `TyCtxt` instead of `TyCtxtAt` in `Ty::is_*` functions) - rust-lang#103653 (Add missing impl blocks for item reexported from private mod in JSON output) - rust-lang#103699 (Emit proper error when casting to `dyn*`) - rust-lang#103719 (fix typo in `try_reserve` method from `HashMap` and `HashSet`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned m-ou-se Oct 5, 2022

rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 5, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2022

MinerSebas reviewed Oct 6, 2022

View reviewed changes

library/panic_unwind/src/gcc.rs Outdated Show resolved Hide resolved

bjorn3 requested changes Oct 6, 2022

View reviewed changes

nbdd0121 force-pushed the panic branch from caafc1b to eb4caf1 Compare October 7, 2022 00:23

rust-highfive assigned Amanieu and unassigned m-ou-se Oct 11, 2022

Amanieu reviewed Oct 11, 2022

View reviewed changes

library/panic_unwind/src/gcc.rs Outdated Show resolved Hide resolved

Amanieu approved these changes Oct 11, 2022

View reviewed changes

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 Oct 11, 2022

matthiaskrgr mentioned this pull request Oct 11, 2022

Rollup of 8 pull requests #102930

Closed

joboet reviewed Oct 12, 2022

View reviewed changes

library/panic_unwind/src/emcc.rs Show resolved Hide resolved

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 Oct 13, 2022

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 Oct 25, 2022

Ignore test on mingw32

bfac2da

nbdd0121 force-pushed the panic branch from ecfbbb8 to bfac2da Compare October 27, 2022 17:23

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 Oct 27, 2022

Dylan-DPC mentioned this pull request Oct 28, 2022

Rollup of 6 pull requests #103685

Closed

Dylan-DPC mentioned this pull request Oct 28, 2022

Rollup of 6 pull requests #103696

Closed

GuillaumeGomez mentioned this pull request Oct 29, 2022

Rollup of 8 pull requests #103727

Merged

bors merged commit 6dd64d3 into rust-lang:master Oct 29, 2022

rustbot added this to the 1.66.0 milestone Oct 29, 2022

nbdd0121 deleted the panic branch October 30, 2022 21:14

bjorn3 mentioned this pull request Nov 22, 2022

Don't leak non-exported symbols from staticlibs #104707

Open

slanterns mentioned this pull request Feb 16, 2023

Rebased: Mark drop calls in landing pads cold instead of noinline #102099

Merged

RalfJung mentioned this pull request Sep 15, 2024

panic runtime and C-unwind documentation rust-lang/reference#1226

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent foreign Rust exceptions from being caught #102721

Prevent foreign Rust exceptions from being caught #102721

nbdd0121 commented Oct 5, 2022

rustbot commented Oct 5, 2022

rust-highfive commented Oct 5, 2022

bjorn3 Oct 6, 2022 •

edited

Loading

nbdd0121 Oct 6, 2022 •

edited

Loading

m-ou-se commented Oct 11, 2022

Amanieu commented Oct 11, 2022

bors commented Oct 11, 2022

joboet commented Oct 12, 2022

bors commented Oct 12, 2022

Amanieu commented Oct 12, 2022

bors commented Oct 12, 2022

bors commented Oct 13, 2022

bors commented Oct 13, 2022

Dylan-DPC commented Oct 25, 2022

nbdd0121 commented Oct 26, 2022

Amanieu commented Oct 27, 2022

nbdd0121 commented Oct 27, 2022

Amanieu commented Oct 27, 2022

Amanieu commented Oct 27, 2022

bors commented Oct 27, 2022

		@@ -47,7 +47,12 @@ static EXCEPTION_TYPE_INFO: TypeInfo = TypeInfo {
		name: b"rust_panic\0".as_ptr(),

Prevent foreign Rust exceptions from being caught #102721

Prevent foreign Rust exceptions from being caught #102721

Conversation

nbdd0121 commented Oct 5, 2022

rustbot commented Oct 5, 2022

rust-highfive commented Oct 5, 2022

bjorn3 Oct 6, 2022 • edited Loading

Choose a reason for hiding this comment

nbdd0121 Oct 6, 2022 • edited Loading

Choose a reason for hiding this comment

m-ou-se commented Oct 11, 2022

Amanieu commented Oct 11, 2022

bors commented Oct 11, 2022

joboet commented Oct 12, 2022

bors commented Oct 12, 2022

Amanieu commented Oct 12, 2022

bors commented Oct 12, 2022

bors commented Oct 13, 2022

bors commented Oct 13, 2022

Dylan-DPC commented Oct 25, 2022

nbdd0121 commented Oct 26, 2022

Amanieu commented Oct 27, 2022

nbdd0121 commented Oct 27, 2022

Amanieu commented Oct 27, 2022

Amanieu commented Oct 27, 2022

bors commented Oct 27, 2022

bjorn3 Oct 6, 2022 •

edited

Loading

nbdd0121 Oct 6, 2022 •

edited

Loading