br0kenpixel/ZygiskNext
1
0
Fork 0
mirror of https://github.com/Dr-TSNG/ZygiskNext.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

show injection status

Browse Source
This commit is contained in:
5ec1cff
2023-12-12 00:43:30 +08:00
parent 993b18752b
commit db60c3185e
5 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
loader/src/ptracer/main.hpp
View File

@@ -6,8 +6,11 @@ bool trace_zygote(int pid);
enum Command {
START = 1,
STOP,
EXIT
STOP = 2,
EXIT = 3,
// sent from daemon
ZYGOTE64_INJECTED = 4,
ZYGOTE32_INJECTED = 5
};
void send_control_command(Command cmd);

39
loader/src/ptracer/monitor.cpp
View File

@@ -114,6 +114,18 @@ public:
static TracingState tracing_state = TRACING;
struct Status {
bool supported = false;
bool zygote_injected = false;
bool daemon_running = false;
pid_t daemon_pid = -1;
std::string daemon_crash_reason;
};
static Status status64;
static Status status32;
struct SocketHandler : public EventHandler {
int sock_fd_;
@@ -182,6 +194,14 @@ struct SocketHandler : public EventHandler {
updateStatus();
loop.Stop();
break;
case ZYGOTE64_INJECTED:
status64.zygote_injected = true;
updateStatus();
break;
case ZYGOTE32_INJECTED:
status32.zygote_injected = true;
updateStatus();
break;
}
}
}
@@ -211,19 +231,10 @@ bool should_stop_inject##abi() { \
CREATE_ZYGOTE_START_COUNTER(64)
CREATE_ZYGOTE_START_COUNTER(32)
struct Status {
bool supported = false;
bool zygote_injected = false;
bool daemon_running = false;
pid_t daemon_pid = -1;
std::string daemon_crash_reason;
};
static Status status64;
static Status status32;
static bool ensure_daemon_created(bool is_64bit) {
auto &status = is_64bit ? status64 : status32;
status.zygote_injected = false;
if (status.daemon_pid == -1) {
auto pid = fork();
if (pid < 0) {
@@ -239,7 +250,6 @@ static bool ensure_daemon_created(bool is_64bit) {
status.supported = true;
status.daemon_pid = pid;
status.daemon_running = true;
updateStatus();
return true;
}
} else {
@@ -363,7 +373,6 @@ public:
LOGW("zygote" #abi " restart too much times, stop injecting"); \
tracing_state = STOPPING; \
monitor_stop_reason = "zygote crashed"; \
updateStatus(); \
ptrace(PTRACE_INTERRUPT, 1, 0, 0); \
break; \
} \
@@ -371,7 +380,6 @@ public:
LOGW("daemon" #abi " not running, stop injecting"); \
tracing_state = STOPPING; \
monitor_stop_reason = "daemon not running"; \
updateStatus(); \
ptrace(PTRACE_INTERRUPT, 1, 0, 0); \
break; \
} \
@@ -401,6 +409,7 @@ public:
}
}
} while (false);
updateStatus();
} else {
LOGE("process %d received unknown status %s", pid,
parse_status(status).c_str());
@@ -445,7 +454,7 @@ static void updateStatus() {
status_text += monitor_stop_reason;
status_text += ")";
}
status_text += ", ";
status_text += ",";
#define WRITE_STATUS_ABI(suffix) \
if (status##suffix.supported) { \
status_text += " zygote" #suffix ":"; \
@@ -464,7 +473,7 @@ static void updateStatus() {
}
WRITE_STATUS_ABI(64)
WRITE_STATUS_ABI(32)
fprintf(prop.get(), "%s[%s]%s", pre_section.c_str(), status_text.c_str(), post_section.c_str());
fprintf(prop.get(), "%s[%s] %s", pre_section.c_str(), status_text.c_str(), post_section.c_str());
}
static bool prepare_environment() {

1
zygiskd/src/constants.rs
View File

@@ -25,6 +25,7 @@ pub const PATH_CP_BIN32: &str = "bin/zygisk-cp32";
pub const PATH_CP_BIN64: &str = "bin/zygisk-cp64";
pub const PATH_PT_BIN32: &str = "bin/zygisk-ptracer32";
pub const PATH_PT_BIN64: &str = "bin/zygisk-ptracer64";
pub const ZYGOTE_INJECTED: i32 = lp_select!(5, 4);
pub const MAX_RESTART_COUNT: i32 = 5;

19
zygiskd/src/utils.rs
View File

@@ -2,10 +2,12 @@ use anyhow::Result;
use std::{fs, io::{Read, Write}, os::unix::net::UnixStream};
use std::ffi::{c_char, c_void, CStr, CString};
use std::os::fd::{AsFd, AsRawFd};
use std::os::unix::net::UnixListener;
use std::os::unix::net::{UnixDatagram, UnixListener};
use std::process::Command;
use std::sync::OnceLock;
use rustix::net::{AddressFamily, bind_unix, listen, socket, SocketAddrUnix, SocketType};
use bitflags::Flags;
use rustix::net::{AddressFamily, bind_unix, connect_unix, listen, SendFlags, sendto_unix, socket, SocketAddrUnix, SocketType};
use rustix::path::Arg;
use rustix::thread::gettid;
#[cfg(target_pointer_width = "64")]
@@ -63,6 +65,11 @@ pub fn set_socket_create_context(context: &str) -> Result<()> {
}
}
pub fn get_current_attr() -> Result<String> {
let s = fs::read("/proc/self/attr/current")?;
Ok(s.to_string_lossy().to_string())
}
pub fn chcon(path: &str, context: &str) -> Result<()> {
Command::new("chcon").arg(context).arg(path).status()?;
Ok(())
@@ -195,6 +202,14 @@ pub fn unix_listener_from_path(path: &str) -> Result<UnixListener> {
Ok(UnixListener::from(socket))
}
pub fn unix_datagram_sendto_abstract(path: &str, buf: &[u8]) -> Result<()> {
let addr = SocketAddrUnix::new_abstract_name(path.as_bytes())?;
let socket = socket(AddressFamily::UNIX, SocketType::DGRAM, None)?;
connect_unix(&socket, &addr)?;
sendto_unix(socket, buf, SendFlags::empty(), &addr)?;
Ok(())
}
pub fn check_unix_socket(stream: &UnixStream, block: bool) -> bool {
unsafe {
let mut pfd = libc::pollfd {

8
zygiskd/src/zygiskd.rs
View File

@@ -50,7 +50,13 @@ pub fn main() -> Result<()> {
log::trace!("New daemon action {:?}", action);
match action {
DaemonSocketAction::PingHeartbeat => {
// Do nothing
utils::set_socket_create_context(utils::get_current_attr()?.as_str())?;
let magic_path = std::env::var("MAGIC")?;
let socket_path = format!("init_monitor{}", magic_path);
log::info!("socket path {}", socket_path);
let value = constants::ZYGOTE_INJECTED;
utils::unix_datagram_sendto_abstract(socket_path.as_str(), &value.to_le_bytes())?;
utils::set_socket_create_context("u:r:zygote:s0")?;
}
DaemonSocketAction::ZygoteRestart => {
info!("Zygote restarted, clean up companions");