SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduced scope of unsafe block (#637)

Browse Source 
* '0517'

* 0517
This commit is contained in:
peamaeq 2022-05-21 01:37:22 +08:00 committed by GitHub
parent 5570601fea
commit ffaad561cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libafl/src/bolts/llmp.rs
View File

@ -585,9 +585,9 @@ impl LlmpMsg {
/// Returns true, if the pointer is, indeed, in the page of this shared map. /// Returns true, if the pointer is, indeed, in the page of this shared map.
#[inline] #[inline]
pub fn in_shmem<SHM: ShMem>(&self, map: &mut LlmpSharedMap<SHM>) -> bool { pub fn in_shmem<SHM: ShMem>(&self, map: &mut LlmpSharedMap<SHM>) -> bool {
let map_size = map.shmem.as_slice().len();
let buf_ptr = self.buf.as_ptr();
unsafe { unsafe {
let map_size = map.shmem.as_slice().len();
let buf_ptr = self.buf.as_ptr();
if buf_ptr > (map.page_mut() as *const u8).add(size_of::<LlmpPage>()) if buf_ptr > (map.page_mut() as *const u8).add(size_of::<LlmpPage>())
&& buf_ptr <= (map.page_mut() as *const u8).add(map_size - size_of::<LlmpMsg>()) && buf_ptr <= (map.page_mut() as *const u8).add(map_size - size_of::<LlmpMsg>())
{ {
@ -1733,17 +1733,16 @@ where
#[allow(clippy::cast_ptr_alignment)] #[allow(clippy::cast_ptr_alignment)]
pub fn msg_from_offset(&mut self, offset: u64) -> Result<*mut LlmpMsg, Error> { pub fn msg_from_offset(&mut self, offset: u64) -> Result<*mut LlmpMsg, Error> {
let offset = offset as usize; let offset = offset as usize;
unsafe {
let page = self.page_mut(); let page = unsafe { self.page_mut() };
let page_size = self.shmem.as_slice().len() - size_of::<LlmpPage>(); let page_size = self.shmem.as_slice().len() - size_of::<LlmpPage>();
if offset > page_size { if offset > page_size {
Err(Error::illegal_argument(format!( Err(Error::illegal_argument(format!(
"Msg offset out of bounds (size: {}, requested offset: {})", "Msg offset out of bounds (size: {}, requested offset: {})",
page_size, offset page_size, offset
))) )))
} else { } else {
Ok(((*page).messages.as_mut_ptr() as *mut u8).add(offset) as *mut LlmpMsg) unsafe { Ok(((*page).messages.as_mut_ptr() as *mut u8).add(offset) as *mut LlmpMsg) }
}
} }
} }
} }