diff --git a/libafl/src/bolts/shmem.rs b/libafl/src/bolts/shmem.rs index 5fb7016bcf..a4e9e75f35 100644 --- a/libafl/src/bolts/shmem.rs +++ b/libafl/src/bolts/shmem.rs @@ -26,11 +26,12 @@ pub type StdShMemProvider = Win32ShMemProvider; pub type StdShMem = Win32ShMem; #[cfg(all(target_os = "android", feature = "std"))] -pub type StdShMemProvider = RcShMemProvider>; +pub type StdShMemProvider = + RcShMemProvider>; #[cfg(all(target_os = "android", feature = "std"))] -pub type StdShMem = RcShMem>; +pub type StdShMem = RcShMem>; #[cfg(all(target_os = "android", feature = "std"))] -pub type StdShMemService = ShMemService; +pub type StdShMemService = ShMemService; #[cfg(all(feature = "std", target_vendor = "apple"))] pub type StdShMemProvider = RcShMemProvider>; @@ -465,7 +466,7 @@ where pub mod unix_shmem { /// Shared memory provider for Android, allocating and forwarding maps over unix domain sockets. #[cfg(target_os = "android")] - pub type UnixShMemProvider = ashmem::ServedShMemProvider; + pub type UnixShMemProvider = ashmem::AshmemShMemProvider; /// Shared memory for Android #[cfg(target_os = "android")] pub type UnixShMem = ashmem::AshmemShMem; @@ -909,7 +910,7 @@ pub mod unix_shmem { //return Err(Error::Unknown("Failed to set the ashmem mapping's name".to_string())); //}; - if ioctl(fd, ASHMEM_SET_SIZE, map_size) != 0 { + if ioctl(fd, ASHMEM_SET_SIZE as _, map_size) != 0 { close(fd); return Err(Error::Unknown( "Failed to set the ashmem mapping's size".to_string(), @@ -944,7 +945,7 @@ pub mod unix_shmem { unsafe { let fd: i32 = id.to_string().parse().unwrap(); #[allow(clippy::cast_sign_loss)] - if ioctl(fd, ASHMEM_GET_SIZE) as u32 as usize != map_size { + if ioctl(fd, ASHMEM_GET_SIZE as _) as u32 as usize != map_size { return Err(Error::Unknown( "The mapping's size differs from the requested size".to_string(), )); @@ -1001,14 +1002,14 @@ pub mod unix_shmem { let fd: i32 = self.id.to_string().parse().unwrap(); #[allow(clippy::cast_sign_loss)] - let length = ioctl(fd, ASHMEM_GET_SIZE) as u32; + let length = ioctl(fd, ASHMEM_GET_SIZE as _) as u32; let ap = ashmem_pin { offset: 0, len: length, }; - ioctl(fd, ASHMEM_UNPIN, &ap); + ioctl(fd, ASHMEM_UNPIN as _, &ap); close(fd); } }