TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-13 13:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use bytemuck

Browse Source
This commit is contained in:
topjohnwu
2023-09-14 13:10:09 -07:00
parent 6a59939d9a
commit dda8cc85c9
9 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
native/src/core/Cargo.toml
View File

@@ -17,3 +17,4 @@ cxx = { workspace = true }
num-traits = { workspace = true }
num-derive = { workspace = true }
quick-protobuf = { workspace = true }
bytemuck = { workspace = true, features = ["derive"] }

33
native/src/core/cert.rs
View File

@@ -1,6 +1,7 @@
use std::fs::File;
use std::io;
use std::io::{Cursor, Read, Seek, SeekFrom};
use std::mem::size_of_val;
use std::os::fd::{FromRawFd, RawFd};
use base::*;
@@ -45,13 +46,13 @@ pub fn read_certificate(fd: RawFd, version: i32) -> Vec<u8> {
// Find EOCD
for i in 0u16.. {
let mut comment_sz = 0u16;
apk.seek(SeekFrom::End(-(comment_sz.bytes_size() as i64) - i as i64))?;
apk.read_flat_data(&mut comment_sz)?;
apk.seek(SeekFrom::End(-(size_of_val(&comment_sz) as i64) - i as i64))?;
apk.read_pod(&mut comment_sz)?;
if comment_sz == i {
apk.seek(SeekFrom::Current(-22))?;
let mut magic = 0u32;
apk.read_flat_data(&mut magic)?;
apk.read_pod(&mut magic)?;
if magic == EOCD_MAGIC {
break;
}
@@ -65,12 +66,12 @@ pub fn read_certificate(fd: RawFd, version: i32) -> Vec<u8> {
// Seek and read central_dir_off to find the start of the central directory
let mut central_dir_off = 0u32;
apk.seek(SeekFrom::Current(12))?;
apk.read_flat_data(&mut central_dir_off)?;
apk.read_pod(&mut central_dir_off)?;
// Code for parse APK comment to get version code
if version >= 0 {
let mut comment_sz = 0u16;
apk.read_flat_data(&mut comment_sz)?;
apk.read_pod(&mut comment_sz)?;
let mut comment = vec![0u8; comment_sz as usize];
apk.read_exact(&mut comment)?;
let mut comment = Cursor::new(&comment);
@@ -90,7 +91,7 @@ pub fn read_certificate(fd: RawFd, version: i32) -> Vec<u8> {
// Next, find the start of the APK signing block
apk.seek(SeekFrom::Start((central_dir_off - 24) as u64))?;
apk.read_flat_data(&mut u64_val)?; // u64_value = block_sz_
apk.read_pod(&mut u64_val)?; // u64_value = block_sz_
let mut magic = [0u8; 16];
apk.read_exact(&mut magic)?;
if magic != APK_SIGNING_BLOCK_MAGIC {
@@ -98,38 +99,40 @@ pub fn read_certificate(fd: RawFd, version: i32) -> Vec<u8> {
}
let mut signing_blk_sz = 0u64;
apk.seek(SeekFrom::Current(
-(u64_val as i64) - (signing_blk_sz.bytes_size() as i64),
-(u64_val as i64) - (size_of_val(&signing_blk_sz) as i64),
))?;
apk.read_flat_data(&mut signing_blk_sz)?;
apk.read_pod(&mut signing_blk_sz)?;
if signing_blk_sz != u64_val {
return Err(bad_apk!("invalid signing block size"));
}
// Finally, we are now at the beginning of the id-value pair sequence
loop {
apk.read_flat_data(&mut u64_val)?; // id-value pair length
apk.read_pod(&mut u64_val)?; // id-value pair length
if u64_val == signing_blk_sz {
break;
}
let mut id = 0u32;
apk.read_flat_data(&mut id)?;
apk.read_pod(&mut id)?;
if id == SIGNATURE_SCHEME_V2_MAGIC {
// Skip [signer sequence length] + [1st signer length] + [signed data length]
apk.seek(SeekFrom::Current((u32_val.bytes_size() * 3) as i64))?;
apk.seek(SeekFrom::Current((size_of_val(&u32_val) * 3) as i64))?;
apk.read_flat_data(&mut u32_val)?; // digest sequence length
apk.read_pod(&mut u32_val)?; // digest sequence length
apk.seek(SeekFrom::Current(u32_val as i64))?; // skip all digests
apk.seek(SeekFrom::Current(u32_val.bytes_size() as i64))?; // cert sequence length
apk.read_flat_data(&mut u32_val)?; // 1st cert length
apk.seek(SeekFrom::Current(size_of_val(&u32_val) as i64))?; // cert sequence length
apk.read_pod(&mut u32_val)?; // 1st cert length
let mut cert = vec![0; u32_val as usize];
apk.read_exact(cert.as_mut())?;
return Ok(cert);
} else {
// Skip this id-value pair
apk.seek(SeekFrom::Current(u64_val as i64 - (id.bytes_size() as i64)))?;
apk.seek(SeekFrom::Current(
u64_val as i64 - (size_of_val(&id) as i64),
))?;
}
}

14
native/src/core/logging.rs
View File

@@ -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();
}
}

1
native/src/core/resetprop/persist.rs
View File

@@ -216,6 +216,7 @@ pub unsafe fn persist_delete_prop(name: *const c_char) -> bool {
}
inner(name).is_ok()
}
pub unsafe fn persist_set_prop(name: *const c_char, value: *const c_char) -> bool {
unsafe fn inner(name: *const c_char, value: *const c_char) -> LoggedResult<()> {
let name = Utf8CStr::from_ptr(name)?;