Use bytemuck

native/src/core/logging.rs

@@ -7,6 +7,7 @@ use std::os::fd::{AsRawFd, FromRawFd, RawFd};
 use std::ptr::null_mut;
 use std::{fs, io};
 
+use bytemuck::{bytes_of, bytes_of_mut, write_zeroes, Pod, Zeroable};
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::FromPrimitive;
 
@@ -110,7 +111,7 @@ pub fn zygisk_logging() {
     }
 }
 
-#[derive(Default)]
+#[derive(Copy, Clone, Pod, Zeroable)]
 #[repr(C)]
 struct LogMeta {
     prio: i32,
@@ -133,7 +134,7 @@ fn write_log_to_pipe(logd: &mut File, prio: i32, msg: &Utf8CStr) -> io::Result<u
         tid: unsafe { gettid() },
     };
 
-    let io1 = IoSlice::new(meta.as_raw_bytes());
+    let io1 = IoSlice::new(bytes_of(&meta));
     let io2 = IoSlice::new(msg);
     logd.write_vectored(&[io1, io2])
 }
@@ -236,21 +237,20 @@ impl Write for LogFile<'_> {
     }
 }
 
-impl FlatData for LogMeta {}
-
 extern "C" fn logfile_writer(arg: *mut c_void) -> *mut c_void {
     fn writer_loop(pipefd: RawFd) -> io::Result<()> {
         let mut pipe = unsafe { File::from_raw_fd(pipefd) };
         let mut tmp = Vec::new();
         let mut logfile: LogFile = Buffer(&mut tmp);
 
-        let mut meta = LogMeta::default();
+        let mut meta = LogMeta::zeroed();
         let mut msg_buf = [0u8; MAX_MSG_LEN];
         let mut aux = Utf8CStrArr::<64>::new();
 
         loop {
             // Read request
-            pipe.read_exact(meta.as_raw_bytes_mut())?;
+            write_zeroes(&mut meta);
+            pipe.read_exact(bytes_of_mut(&mut meta))?;
 
             if meta.prio < 0 {
                 if matches!(logfile, LogFile::Buffer(_)) {
@@ -369,6 +369,6 @@ impl MagiskD {
             tid: 0,
         };
 
-        logd.write_all(meta.as_raw_bytes()).ok();
+        logd.write_all(bytes_of(&meta)).ok();
     }
 }