br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

don't panic in handle_daemon_action

Browse Source
This commit is contained in:
5ec1cff
2023-12-20 11:47:43 +08:00
parent 92ac6d4f1a
commit dce2937ba0
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
zygiskd/src/zygiskd.rs
View File

@@ -85,7 +85,9 @@ pub fn main() -> Result<()> {
} }
_ => { _ => {
thread::spawn(move || { thread::spawn(move || {
handle_daemon_action(action, stream, &context); if let Err(e) = handle_daemon_action(action, stream, &context) {
log::warn!("Error handling daemon action: {}\n{}", e, e.backtrace());
}
}); });
} }
} }
@@ -211,7 +213,7 @@ fn spawn_companion(name: &str, lib_fd: RawFd) -> Result<Option<UnixStream>> {
exit(0) exit(0)
} }
fn handle_daemon_action(action: DaemonSocketAction, mut stream: UnixStream, context: &Context) { fn handle_daemon_action(action: DaemonSocketAction, mut stream: UnixStream, context: &Context) -> Result<()> {
match action { match action {
DaemonSocketAction::RequestLogcatFd => { DaemonSocketAction::RequestLogcatFd => {
loop { loop {
@@ -219,13 +221,13 @@ fn handle_daemon_action(action: DaemonSocketAction, mut stream: UnixStream, cont
Ok(level) => level, Ok(level) => level,
Err(_) => break, Err(_) => break,
}; };
let tag = stream.read_string().unwrap(); let tag = stream.read_string()?;
let message = stream.read_string().unwrap(); let message = stream.read_string()?;
utils::log_raw(level as i32, &tag, &message).unwrap(); utils::log_raw(level as i32, &tag, &message)?;
} }
} }
DaemonSocketAction::GetProcessFlags => { DaemonSocketAction::GetProcessFlags => {
let uid = stream.read_u32().unwrap() as i32; let uid = stream.read_u32()? as i32;
let mut flags = ProcessFlags::empty(); let mut flags = ProcessFlags::empty();
if root_impl::uid_granted_root(uid) { if root_impl::uid_granted_root(uid) {
flags |= ProcessFlags::PROCESS_GRANTED_ROOT; flags |= ProcessFlags::PROCESS_GRANTED_ROOT;
@@ -240,17 +242,17 @@ fn handle_daemon_action(action: DaemonSocketAction, mut stream: UnixStream, cont
} }
log::trace!("Uid {} granted root: {}", uid, flags.contains(ProcessFlags::PROCESS_GRANTED_ROOT)); log::trace!("Uid {} granted root: {}", uid, flags.contains(ProcessFlags::PROCESS_GRANTED_ROOT));
log::trace!("Uid {} on denylist: {}", uid, flags.contains(ProcessFlags::PROCESS_ON_DENYLIST)); log::trace!("Uid {} on denylist: {}", uid, flags.contains(ProcessFlags::PROCESS_ON_DENYLIST));
stream.write_u32(flags.bits()).unwrap(); stream.write_u32(flags.bits())?;
} }
DaemonSocketAction::ReadModules => { DaemonSocketAction::ReadModules => {
stream.write_usize(context.modules.len()).unwrap(); stream.write_usize(context.modules.len())?;
for module in context.modules.iter() { for module in context.modules.iter() {
stream.write_string(&module.name).unwrap(); stream.write_string(&module.name)?;
stream.send_fd(module.lib_fd.as_raw_fd()).unwrap(); stream.send_fd(module.lib_fd.as_raw_fd())?;
} }
} }
DaemonSocketAction::RequestCompanionSocket => { DaemonSocketAction::RequestCompanionSocket => {
let index = stream.read_usize().unwrap(); let index = stream.read_usize()?;
let module = &context.modules[index]; let module = &context.modules[index];
let mut companion = module.companion.lock().unwrap(); let mut companion = module.companion.lock().unwrap();
if let Some(Some(sock)) = companion.as_ref() { if let Some(Some(sock)) = companion.as_ref() {
@@ -278,22 +280,23 @@ fn handle_daemon_action(action: DaemonSocketAction, mut stream: UnixStream, cont
Some(Some(sock)) => { Some(Some(sock)) => {
if let Err(e) = sock.send_fd(stream.as_raw_fd()) { if let Err(e) = sock.send_fd(stream.as_raw_fd()) {
log::error!("Failed to send companion fd socket of module `{}`: {}", module.name, e); log::error!("Failed to send companion fd socket of module `{}`: {}", module.name, e);
stream.write_u8(0).unwrap(); stream.write_u8(0)?;
} }
// Ok: Send by companion // Ok: Send by companion
} }
_ => { _ => {
stream.write_u8(0).unwrap(); stream.write_u8(0)?;
} }
} }
} }
DaemonSocketAction::GetModuleDir => { DaemonSocketAction::GetModuleDir => {
let index = stream.read_usize().unwrap(); let index = stream.read_usize()?;
let module = &context.modules[index]; let module = &context.modules[index];
let dir = format!("{}/{}", constants::PATH_MODULES_DIR, module.name); let dir = format!("{}/{}", constants::PATH_MODULES_DIR, module.name);
let dir = fs::File::open(dir).unwrap(); let dir = fs::File::open(dir)?;
stream.send_fd(dir.as_raw_fd()).unwrap(); stream.send_fd(dir.as_raw_fd())?;
} }
_ => {} _ => {}
} }
Ok(())
} }