nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

SGX target: change re-entry abort logic

Browse Source
This commit is contained in:
Jethro Beekman 2019-04-16 18:07:29 -07:00
parent c132c96a6d
commit d0a1c2d3e0
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libstd/sys/sgx/abi/entry.S
View File

@ -65,10 +65,6 @@ IMAGE_BASE:
/* The size in bytes of enclacve EH_FRM_HDR section */
globvar EH_FRM_HDR_SIZE 8
.Lreentry_panic_msg:
.asciz "Re-entered aborted enclave!"
.Lreentry_panic_msg_end:
.org .Lxsave_clear+512
.Lxsave_header:
.int 0, 0 /* XSTATE_BV */
@ -210,10 +206,8 @@ sgx_entry:
/* end sgx_entry */
.Lreentry_panic:
lea .Lreentry_panic_msg(%rip),%rdi
mov $.Lreentry_panic_msg_end-.Lreentry_panic_msg,%esi
orq $8,%rsp
jmp panic_msg
jmp abort_reentry
/* This *MUST* be called with 6 parameters, otherwise register information */
/* might leak! */
@ -279,10 +273,8 @@ usercall:
/*
The following functions need to be defined externally:
```
// Called by entry code when it needs to panic
extern "C" fn panic_msg(msg: &'static str) -> ! {
panic!(msg)
}
// Called by entry code on re-entry after exit
extern "C" fn abort_reentry() -> !;
// Called once when a TCS is first entered
extern "C" fn tcs_init(secondary: bool);

8
src/libstd/sys/sgx/abi/mod.rs
View File

@ -29,7 +29,7 @@ unsafe extern "C" fn tcs_init(secondary: bool) {
static RELOC_STATE: AtomicUsize = AtomicUsize::new(UNINIT);
if secondary && RELOC_STATE.load(Ordering::Relaxed) != DONE {
panic::panic_msg("Entered secondary TCS before main TCS!")
rtabort!("Entered secondary TCS before main TCS!")
}
// Try to atomically swap UNINIT with BUSY. The returned state can be:
@ -92,3 +92,9 @@ pub(super) fn exit_with_code(code: isize) -> ! {
}
usercalls::exit(code != 0);
}
#[cfg(not(test))]
#[no_mangle]
extern "C" fn abort_reentry() -> ! {
usercalls::exit(false)
}

8
src/libstd/sys/sgx/abi/panic.rs
View File

@ -1,4 +1,4 @@
use super::usercalls::{alloc::UserRef, self};
use super::usercalls::alloc::UserRef;
use crate::cmp;
use crate::io::{self, Write};
use crate::mem;
@ -48,9 +48,3 @@ impl Write for SgxPanicOutput {
Ok(())
}
}
#[cfg_attr(not(test), no_mangle)]
pub extern "C" fn panic_msg(msg: &str) -> ! {
let _ = SgxPanicOutput::new().map(|mut out| out.write(msg.as_bytes()));
usercalls::exit(true)
}