Refactor util_libc
#765
Refactor util_libc
#765
Conversation
| res if res > 0 => { | ||
| let len = usize::try_from(res).map_err(|_| Error::UNEXPECTED)?; | ||
| let (l, r) = buf.split_at_mut_checked(len).ok_or(Error::UNEXPECTED)?; | ||
| unsafe { sanitizer::unpoison(l) }; |
There was a problem hiding this comment.
Note that it applies unpoison to all users of sys_fill_exact. It's redundant in some cases (e.g. when we read from /dev/urandom), but AFAIK it has no negative consequences (outside of outlandish scenarios of misbehaving libc), while allowing to simplify the code a fair bit.
| #[path = "../util_libc.rs"] | ||
| mod util_libc; | ||
| #[path = "../utils/get_errno.rs"] | ||
| mod utils; |
There was a problem hiding this comment.
We could move imports of errno_location for 4 targets which use this backends here, but I don't think it's worth the trouble since all 4 targets use different names.
dhardy
left a comment
dhardy
left a comment
There was a problem hiding this comment.
LGTM, esp. the changes to get_errno.
|
|
||
| pub(crate) use get_errno::get_errno; | ||
|
|
||
| pub(crate) fn sys_fill_exact( |
There was a problem hiding this comment.
This fn lost its doc which should still be valid and has some (internal) use.
| loop { | ||
| let ret = unsafe { getrandom_syscall(dest.as_mut_ptr().cast(), dest.len(), 0) }; | ||
| unsafe { sanitizer::unpoison_linux_getrandom_result(dest, ret) }; | ||
| match usize::try_from(ret) { | ||
| Ok(0) => return Err(Error::UNEXPECTED), | ||
| Ok(len) => { | ||
| dest = dest.get_mut(len..).ok_or(Error::UNEXPECTED)?; | ||
| let (l, r) = dest.split_at_mut_checked(len).ok_or(Error::UNEXPECTED)?; | ||
| unsafe { utils::unpoison(l) }; | ||
| dest = r; | ||
| if dest.is_empty() { | ||
| return Ok(()); | ||
| } | ||
| } | ||
| Err(_) if ret == EINTR => continue, | ||
| Err(_) => { | ||
| let code = i32::try_from(ret).map_err(|_| Error::UNEXPECTED)?; | ||
| return Err(Error::from_neg_error_code(code)); | ||
| } | ||
| } |
There was a problem hiding this comment.
Why doesn't this use sys_fill_exact?
This PR refactors
util_libc,sanitizer, andlazymodules. The modules are moved into theutilsdirectory and "mounted" with#[path = ".."]. With this change all uses of#[path = ".."]point towards theutilsdirectory.