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

Fix the issue that process resource cannot be freed in some cases

Browse Source 
If untrusted app calls "occlum_pal_exec" sequentially or concurrently,
Occlum cannot free the resource of the enclave process correctly.
This commit is contained in:
LI Qing 2020-02-20 08:26:02 +00:00
parent b08f5b9ceb
commit 6f986855e9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libos/src/process/task.rs
View File

@ -101,14 +101,15 @@ pub fn run_task(libos_tid: pid_t, host_tid: pid_t) -> Result<i32> {
do_run_task(task);
}
let exit_status = {
let (exit_status, parent_pid) = {
let mut process = new_process.lock().unwrap();
process.get_exit_status()
let parent = process.get_parent().lock().unwrap();
(process.get_exit_status(), parent.get_tid())
};
// Init process does not have any parent, so it has to release itself
if pid == 1 {
process_table::remove(1);
// If process's parent is the IDLE_PROCESS (pid = 0), so it has to release itself
if parent_pid == 0 {
process_table::remove(pid);
}
reset_current();