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

Fix poll when given negative fds

Browse Source
This commit is contained in:
Tate, Hongliang Tian 2020-03-27 08:08:20 +00:00 committed by tate.thl
parent 6dbdbfdcf0
commit 1eefa0a123
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libos/src/net/io_multiplexing.rs
View File

@ -132,6 +132,13 @@ pub fn do_poll(pollfds: &mut [libc::pollfd], timeout: c_int) -> Result<usize> {
let current_ref = process::get_current(); let current_ref = process::get_current();
let mut proc = current_ref.lock().unwrap(); let mut proc = current_ref.lock().unwrap();
for (i, pollfd) in pollfds.iter_mut().enumerate() { for (i, pollfd) in pollfds.iter_mut().enumerate() {
// Poll should just ignore negative fds
if pollfd.fd < 0 {
u_pollfds[i].fd = -1;
u_pollfds[i].revents = 0;
continue;
}
let file_ref = proc let file_ref = proc
.get_files() .get_files()
.lock() .lock()