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

Add catch unwind for occlum_ecall_init

Browse Source
This commit is contained in:
Hui, Chunyang 2023-03-15 15:22:26 +08:00 committed by volcano
parent 04083cc200
commit 478d0d381f
1 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,48 +108,14 @@ pub extern "C" fn occlum_ecall_init(
std::alloc::set_alloc_error_hook(oom_handle); std::alloc::set_alloc_error_hook(oom_handle);
}); });
// Parse host file panic::catch_unwind(|| {
let resolv_conf_ptr = unsafe { (*file_buffer).resolv_conf_buf }; backtrace::__rust_begin_short_backtrace(|| {
match parse_host_file(HostFile::ResolvConf, resolv_conf_ptr) { // Ignore the error when parsing host files
Err(e) => { let _ = parse_host_files(file_buffer);
error!("failed to parse /etc/resolv.conf: {}", e.backtrace()); 0 as i32
} })
Ok(resolv_conf_str) => { })
*RESOLV_CONF_STR.write().unwrap() = Some(resolv_conf_str); .unwrap_or(ecall_errno!(EFAULT))
if let Err(e) = write_host_file(HostFile::ResolvConf) {
error!("failed to write /etc/resolv.conf: {}", e.backtrace());
}
}
}
let hostname_ptr = unsafe { (*file_buffer).hostname_buf };
match parse_host_file(HostFile::HostName, hostname_ptr) {
Err(e) => {
error!("failed to parse /etc/hostname: {}", e.backtrace());
}
Ok(hostname_str) => {
misc::init_nodename(&hostname_str);
*HOSTNAME_STR.write().unwrap() = Some(hostname_str);
if let Err(e) = write_host_file(HostFile::HostName) {
error!("failed to write /etc/hostname: {}", e.backtrace());
}
}
}
let hosts_ptr = unsafe { (*file_buffer).hosts_buf };
match parse_host_file(HostFile::Hosts, hosts_ptr) {
Err(e) => {
error!("failed to parse /etc/hosts: {}", e.backtrace());
}
Ok(hosts_str) => {
*HOSTS_STR.write().unwrap() = Some(hosts_str);
if let Err(e) = write_host_file(HostFile::Hosts) {
error!("failed to write /etc/hosts: {}", e.backtrace());
}
}
}
0
} }
// hook for memory allocation error // hook for memory allocation error
@ -453,3 +419,48 @@ fn merge_env(env: *const *const c_char) -> Result<Vec<CString>> {
trace!("env_checked from env untrusted: {:?}", env_checked); trace!("env_checked from env untrusted: {:?}", env_checked);
Ok([env_keep, env_checked].concat()) Ok([env_keep, env_checked].concat())
} }
// Parse host files
fn parse_host_files(file_buffer: *const host_file_buffer) -> Result<i32> {
let resolv_conf_ptr = unsafe { (*file_buffer).resolv_conf_buf };
match parse_host_file(HostFile::ResolvConf, resolv_conf_ptr) {
Err(e) => {
error!("failed to parse /etc/resolv.conf: {}", e.backtrace());
}
Ok(resolv_conf_str) => {
*RESOLV_CONF_STR.write().unwrap() = Some(resolv_conf_str);
if let Err(e) = write_host_file(HostFile::ResolvConf) {
error!("failed to write /etc/resolv.conf: {}", e.backtrace());
}
}
}
let hostname_ptr = unsafe { (*file_buffer).hostname_buf };
match parse_host_file(HostFile::HostName, hostname_ptr) {
Err(e) => {
error!("failed to parse /etc/hostname: {}", e.backtrace());
}
Ok(hostname_str) => {
misc::init_nodename(&hostname_str);
*HOSTNAME_STR.write().unwrap() = Some(hostname_str);
if let Err(e) = write_host_file(HostFile::HostName) {
error!("failed to write /etc/hostname: {}", e.backtrace());
}
}
}
let hosts_ptr = unsafe { (*file_buffer).hosts_buf };
match parse_host_file(HostFile::Hosts, hosts_ptr) {
Err(e) => {
error!("failed to parse /etc/hosts: {}", e.backtrace());
}
Ok(hosts_str) => {
*HOSTS_STR.write().unwrap() = Some(hosts_str);
if let Err(e) = write_host_file(HostFile::Hosts) {
error!("failed to write /etc/hosts: {}", e.backtrace());
}
}
}
Ok(0)
}