general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harden the two enclave entry functions

Browse Source
This commit is contained in:
Zhengde Zhai 2019-11-15 09:30:44 +00:00 committed by Tate, Hongliang Tian
parent dc14f27a29
commit 434dff9128
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libos/src/entry.rs
View File

@ -3,14 +3,29 @@ use exception::*;
use process::pid_t; use process::pid_t;
use std::ffi::{CStr, CString, OsString}; use std::ffi::{CStr, CString, OsString};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Once;
use util::mem_util::from_untrusted::*; use util::mem_util::from_untrusted::*;
const ENCLAVE_PATH: &'static str = ".occlum/build/lib/libocclum.signed.so"; const ENCLAVE_PATH: &'static str = ".occlum/build/lib/libocclum.signed.so";
lazy_static! {
static ref INIT_ONCE: Once = Once::new();
static ref ALLOW_RUN: AtomicBool = AtomicBool::new(false);
}
#[no_mangle] #[no_mangle]
pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char) -> i32 { pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char) -> i32 {
// Init the log infrastructure first so that log messages will be printed afterwards INIT_ONCE.call_once(|| {
util::log::init(); // Init the log infrastructure first so that log messages will be printed afterwards
util::log::init();
// Init OpenMP for SFI
util::mpx_util::mpx_enable();
// Register exception handlers (support cpuid & rdtsc for now)
register_exception_handlers();
ALLOW_RUN.store(true, Ordering::SeqCst);
});
let (path, args) = match parse_arguments(path_buf, argv) { let (path, args) = match parse_arguments(path_buf, argv) {
Ok(path_and_args) => path_and_args, Ok(path_and_args) => path_and_args,
@ -19,10 +34,7 @@ pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char
return EXIT_STATUS_INTERNAL_ERROR; return EXIT_STATUS_INTERNAL_ERROR;
} }
}; };
// register exception handlers (support cpuid & rdtsc for now) // register exception handlers (support cpuid & rdtsc for now)
register_exception_handlers();
let _ = backtrace::enable_backtrace(ENCLAVE_PATH, PrintFormat::Short); let _ = backtrace::enable_backtrace(ENCLAVE_PATH, PrintFormat::Short);
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| match do_boot(&path, &args) { backtrace::__rust_begin_short_backtrace(|| match do_boot(&path, &args) {
@ -38,6 +50,10 @@ pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char
#[no_mangle] #[no_mangle]
pub extern "C" fn libos_run(host_tid: i32) -> i32 { pub extern "C" fn libos_run(host_tid: i32) -> i32 {
if ALLOW_RUN.load(Ordering::SeqCst) == false {
return EXIT_STATUS_INTERNAL_ERROR;
}
let _ = backtrace::enable_backtrace(ENCLAVE_PATH, PrintFormat::Short); let _ = backtrace::enable_backtrace(ENCLAVE_PATH, PrintFormat::Short);
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| match do_run(host_tid as pid_t) { backtrace::__rust_begin_short_backtrace(|| match do_run(host_tid as pid_t) {
@ -87,11 +103,7 @@ fn parse_arguments(
Ok((path_buf, args)) Ok((path_buf, args))
} }
// TODO: make sure do_boot can only be called once
fn do_boot(program_path: &PathBuf, argv: &Vec<CString>) -> Result<()> { fn do_boot(program_path: &PathBuf, argv: &Vec<CString>) -> Result<()> {
// info!("boot: path: {:?}, argv: {:?}", path_str, argv);
util::mpx_util::mpx_enable()?;
validate_program_path(program_path)?; validate_program_path(program_path)?;
let envp = &config::LIBOS_CONFIG.env; let envp = &config::LIBOS_CONFIG.env;
@ -99,11 +111,9 @@ fn do_boot(program_path: &PathBuf, argv: &Vec<CString>) -> Result<()> {
let parent = &process::IDLE_PROCESS; let parent = &process::IDLE_PROCESS;
let program_path_str = program_path.to_str().unwrap(); let program_path_str = program_path.to_str().unwrap();
process::do_spawn(&program_path_str, argv, envp, &file_actions, parent)?; process::do_spawn(&program_path_str, argv, envp, &file_actions, parent)?;
Ok(()) Ok(())
} }
// TODO: make sure do_run() cannot be called after do_boot()
fn do_run(host_tid: pid_t) -> Result<i32> { fn do_run(host_tid: pid_t) -> Result<i32> {
let exit_status = process::run_task(host_tid)?; let exit_status = process::run_task(host_tid)?;