user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exposing enclave image-base to the enclave application

Browse source 
image-base could be used by crates like backtrace to providing to make
symbol resolution easier.
This commit is contained in:
Vardhan Thigle 2019-01-09 17:20:37 +05:30
parent 4166a4e5d0
commit 2e4766c3af
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/sys/sgx/abi/mem.rs
View file

@ -17,8 +17,10 @@ extern {
// Do not remove inline: will result in relocation failure
// For the same reason we use inline ASM here instead of an extern static to
// locate the base
/// Returns address at which current enclave is loaded.
#[inline(always)]
fn image_base() -> u64 {
#[unstable(feature = "sgx_platform", issue = "56975")]
pub fn image_base() -> u64 {
let base;
unsafe { asm!("lea IMAGE_BASE(%rip),$0":"=r"(base)) };
base

8
src/libstd/sys/sgx/backtrace.rs
View file

@ -3,6 +3,7 @@ use error::Error;
use libc;
use sys_common::backtrace::Frame;
use unwind as uw;
use sys::sgx::abi::mem::image_base;
pub struct BacktraceContext;
@ -75,11 +76,6 @@ extern "C" fn trace_fn(
uw::_URC_NO_REASON
}
extern {
static IMAGE_BASE: u8;
}
// To reduce TCB size in Sgx enclave, we do not want to implement resolve_symname functionality.
// Rather, we print the offset of the address here, which could be later mapped to correct function.
pub fn resolve_symname<F>(frame: Frame,
@ -88,7 +84,7 @@ pub fn resolve_symname<F>(frame: Frame,
where F: FnOnce(Option<&str>) -> io::Result<()>
{
callback(Some(&format!("0x{:x}",
(unsafe {frame.symbol_addr.wrapping_offset_from(&IMAGE_BASE)}))))
(frame.symbol_addr.wrapping_offset_from(image_base() as _)))))
}
pub fn foreach_symbol_fileline<F>(_: Frame,