Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 09:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic in FutexKey::load_val when no read access

Browse Source
This commit is contained in:
Marsman1996
2024-09-14 17:02:57 +08:00
committed by Tate, Hongliang Tian
parent f3174dbbbc
commit 44629e4627
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/src/process/posix_thread/futex.rs
View File

@ -41,8 +41,11 @@ pub fn futex_wait_bitset(
// lock futex bucket ref here to avoid data race // lock futex bucket ref here to avoid data race
let mut futex_bucket = futex_bucket_ref.lock(); let mut futex_bucket = futex_bucket_ref.lock();
if futex_key.load_val() != futex_val { if !futex_key.load_val().is_ok_and(|val| val == futex_val) {
return_errno_with_message!(Errno::EAGAIN, "futex value does not match"); return_errno_with_message!(
Errno::EAGAIN,
"futex value does not match or load_val failed"
);
} }
futex_bucket.add_item(futex_item); futex_bucket.add_item(futex_item);
@ -327,10 +330,10 @@ impl FutexKey {
Self { addr, bitset } Self { addr, bitset }
} }
pub fn load_val(&self) -> i32 { pub fn load_val(&self) -> Result<i32> {
// FIXME: how to implement a atomic load? // FIXME: how to implement a atomic load?
warn!("implement an atomic load"); warn!("implement an atomic load");
CurrentUserSpace::get().read_val(self.addr).unwrap() CurrentUserSpace::get().read_val(self.addr)
} }
pub fn addr(&self) -> Vaddr { pub fn addr(&self) -> Vaddr {