From 389c7c655466236f0b7034a1b3b7e3c796982c2a Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Wed, 23 Aug 2023 00:32:34 +0100
Subject: [PATCH] bolts: fix freebsd clippy warnings (#1442)

---
 libafl_bolts/src/core_affinity.rs |  3 +--
 libafl_bolts/src/minibsod.rs      | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libafl_bolts/src/core_affinity.rs b/libafl_bolts/src/core_affinity.rs
index 07ae81c1a5..d67eada672 100644
--- a/libafl_bolts/src/core_affinity.rs
+++ b/libafl_bolts/src/core_affinity.rs
@@ -662,8 +662,7 @@ mod freebsd {
     #[allow(trivial_numeric_casts)]
     pub fn get_core_ids() -> Result<Vec<CoreId>, Error> {
         Ok((0..(usize::from(available_parallelism()?)))
-            .into_iter()
-            .map(|n| CoreId(n))
+            .map(CoreId)
             .collect::<Vec<_>>())
     }
 
diff --git a/libafl_bolts/src/minibsod.rs b/libafl_bolts/src/minibsod.rs
index a616247ec6..5359b716df 100644
--- a/libafl_bolts/src/minibsod.rs
+++ b/libafl_bolts/src/minibsod.rs
@@ -631,6 +631,7 @@ fn write_minibsod<W: Write>(writer: &mut BufWriter<W>) -> Result<(), std::io::Er
 }
 
 #[cfg(any(target_os = "freebsd", target_os = "netbsd"))]
+#[allow(clippy::cast_ptr_alignment)]
 fn write_minibsod<W: Write>(writer: &mut BufWriter<W>) -> Result<(), std::io::Error> {
     let mut s: usize = 0;
     #[cfg(target_os = "freebsd")]
@@ -667,7 +668,10 @@ fn write_minibsod<W: Write>(writer: &mut BufWriter<W>) -> Result<(), std::io::Er
                 while start < end {
                     let entry = start as *mut u8 as *mut libc::kinfo_vmentry;
                     #[cfg(target_os = "freebsd")]
-                    let sz = (*entry).kve_structsize as usize;
+                    let sz: usize = (*entry)
+                        .kve_structsize
+                        .try_into()
+                        .expect("invalid kve_structsize value");
                     #[cfg(target_os = "netbsd")]
                     let sz = std::mem::size_of::<libc::kinfo_vmentry>();
                     if sz == 0 {
@@ -680,9 +684,9 @@ fn write_minibsod<W: Write>(writer: &mut BufWriter<W>) -> Result<(), std::io::Er
                         (*entry).kve_end,
                         (*entry).kve_path
                     );
-                    writer.write(&i.into_bytes())?;
+                    writer.write_all(&i.into_bytes())?;
 
-                    start = start + sz;
+                    start += sz;
                 }
             }
         } else {