TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-07-28 20:33:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Zygisk code out of module.cpp

Browse Source
This commit is contained in:
topjohnwu 2025-07-07 10:58:02 -07:00 committed by John Wu
parent 2a42ca2b8f
commit 55c3ee3a6f
9 changed files with 135 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/core/daemon.cpp
View File

@ -218,13 +218,7 @@ static void handle_request_sync(int client, int code) {
denylist_handler(-1, nullptr);
// Restore native bridge property
auto nb = get_prop(NBPROP);
auto len = sizeof(ZYGISKLDR) - 1;
if (nb == ZYGISKLDR) {
set_prop(NBPROP, "0");
} else if (nb.size() > len) {
set_prop(NBPROP, nb.data() + len);
}
restore_zygisk_prop();
write_int(client, 0);

3
native/src/core/daemon.rs
View File

@ -145,8 +145,9 @@ impl MagiskD {
);
initialize_denylist();
setup_module_mount();
let modules = self.handle_modules();
let modules = self.load_modules();
self.module_list.set(modules).ok();
self.apply_modules();
clean_mounts();
false

6
native/src/core/include/core.hpp
View File

@ -28,14 +28,16 @@ enum class RespondCode : int {
struct ModuleInfo;
extern std::string native_bridge;
// Daemon
int connect_daemon(int req, bool create = false);
const char *get_magisk_tmp();
void unlock_blocks();
bool setup_magisk_env();
bool check_key_combo();
// Zygisk daemon
rust::Str get_zygisk_lib_name();
void set_zygisk_prop();
void restore_zygisk_prop();
// Sockets

6
native/src/core/lib.rs
View File

@ -12,7 +12,6 @@ use cxx::{ExternType, type_id};
use daemon::{MagiskD, daemon_entry};
use derive::Decodable;
use logging::{android_logging, setup_logfile, zygisk_close_logd, zygisk_get_logd, zygisk_logging};
use module::load_modules;
use mount::{find_preinit_device, revert_unmount};
use resetprop::{persist_delete_prop, persist_get_prop, persist_get_props, persist_set_prop};
use selinux::{lgetfilecon, lsetfilecon, restorecon, setfilecon};
@ -173,6 +172,7 @@ pub mod ffi {
fn uninstall_pkg(apk: Utf8CStrRef);
fn update_deny_flags(uid: i32, process: &str, flags: &mut u32);
fn initialize_denylist();
fn get_zygisk_lib_name() -> &'static str;
fn restore_zygisk_prop();
fn switch_mnt_ns(pid: i32) -> i32;
fn app_request(req: &SuAppRequest) -> i32;
@ -223,8 +223,6 @@ pub mod ffi {
#[namespace = "rust"]
fn daemon_entry();
#[namespace = "rust"]
fn load_modules(module_list: &[ModuleInfo], zygisk_name: &str);
}
// Default constructors
@ -259,7 +257,7 @@ pub mod ffi {
fn get() -> &'static MagiskD;
}
unsafe extern "C++" {
fn handle_modules(self: &MagiskD) -> Vec<ModuleInfo>;
fn load_modules(self: &MagiskD) -> Vec<ModuleInfo>;
}
}

19
native/src/core/module.cpp
View File

@ -125,7 +125,7 @@ static rust::Vec<ModuleInfo> collect_modules(bool zygisk_enabled, bool open_zygi
}
return fd;
};
std::for_each(modules.begin(),modules.end(), [&](ModuleInfo &info) {
ranges::for_each(modules, [&](ModuleInfo &info) {
info.z32 = convert_to_memfd(info.z32);
info.z64 = convert_to_memfd(info.z64);
});
@ -133,28 +133,15 @@ static rust::Vec<ModuleInfo> collect_modules(bool zygisk_enabled, bool open_zygi
return modules;
}
rust::Vec<ModuleInfo> MagiskD::handle_modules() const noexcept {
rust::Vec<ModuleInfo> MagiskD::load_modules() const noexcept {
bool zygisk = zygisk_enabled();
prepare_modules();
exec_module_scripts("post-fs-data", collect_modules(zygisk, false));
// Recollect modules (module scripts could remove itself)
auto list = collect_modules(zygisk, true);
if (zygisk) {
string native_bridge_orig = get_prop(NBPROP);
if (native_bridge_orig.empty()) {
native_bridge_orig = "0";
set_zygisk_prop();
}
native_bridge = native_bridge_orig != "0" ? ZYGISKLDR + native_bridge_orig : ZYGISKLDR;
set_prop(NBPROP, native_bridge.data());
// Whether Huawei's Maple compiler is enabled.
// If so, system server will be created by a special Zygote which ignores the native bridge
// and make system server out of our control. Avoid it by disabling.
if (get_prop("ro.maple.enable") == "1") {
set_prop("ro.maple.enable", "0");
}
}
rust::load_modules(rust::Slice<const ModuleInfo>(list), zygisk ? native_bridge : "");
return list;
}

21
native/src/core/module.rs
View File

@ -1,5 +1,6 @@
use crate::consts::{MODULEMNT, MODULEROOT, WORKERDIR};
use crate::ffi::{ModuleInfo, get_magisk_tmp};
use crate::daemon::MagiskD;
use crate::ffi::{get_magisk_tmp, get_zygisk_lib_name};
use crate::load_prop_file;
use base::{
Directory, FsPathBuilder, LoggedResult, OsResultStatic, ResultExt, Utf8CStr, Utf8CStrBuf,
@ -487,7 +488,9 @@ fn inject_magisk_bins(system: &mut FsNode) {
}
}
fn inject_zygisk_bins(system: &mut FsNode, name: &str) {
fn inject_zygisk_bins(system: &mut FsNode) {
let name = get_zygisk_lib_name();
#[cfg(target_pointer_width = "64")]
let has_32_bit = cstr!("/system/bin/linker").exists();
@ -543,7 +546,8 @@ fn inject_zygisk_bins(system: &mut FsNode, name: &str) {
}
}
pub fn load_modules(module_list: &[ModuleInfo], zygisk_name: &str) {
impl MagiskD {
pub fn apply_modules(&self) {
let mut system = FsNode::new_dir();
// Build all the base "prefix" paths
@ -569,10 +573,10 @@ pub fn load_modules(module_list: &[ModuleInfo], zygisk_name: &str) {
// Step 1: Create virtual filesystem tree
//
// In this step, there is zero logic applied during tree construction; we simply collect
// and record the union of all module filesystem trees under each of their /system directory.
// In this step, there is zero logic applied during tree construction; we simply collect and
// record the union of all module filesystem trees under each of their /system directory.
for info in module_list {
for info in self.module_list.get().iter().flat_map(|v| v.iter()) {
let mut module_paths = root_paths.append(&info.name);
{
// Read props
@ -610,8 +614,8 @@ pub fn load_modules(module_list: &[ModuleInfo], zygisk_name: &str) {
if get_magisk_tmp() != "/sbin" || get_path_env().split(":").all(|s| s != "/sbin") {
inject_magisk_bins(&mut system);
}
if !zygisk_name.is_empty() {
inject_zygisk_bins(&mut system, zygisk_name);
if self.zygisk_enabled() {
inject_zygisk_bins(&mut system);
}
// Step 3: Extract all supported read-only partition roots
@ -649,4 +653,5 @@ pub fn load_modules(module_list: &[ModuleInfo], zygisk_name: &str) {
let path = root_paths.append(dir);
root.commit(path, true).log_ok();
}
}
}

25
native/src/core/zygisk/entry.cpp
View File

@ -10,7 +10,7 @@
using namespace std;
string native_bridge = "0";
static string zygisk_lib_name = "0";
static void zygiskd(int socket) {
if (getuid() != 0 || fcntl(socket, F_GETFD) < 0)
@ -110,10 +110,29 @@ extern "C" [[maybe_unused]] NativeBridgeCallbacks NativeBridgeItf {
},
};
rust::Str get_zygisk_lib_name() {
return zygisk_lib_name;
}
void set_zygisk_prop() {
string native_bridge_orig = get_prop(NBPROP);
if (native_bridge_orig.empty()) {
native_bridge_orig = "0";
}
zygisk_lib_name = native_bridge_orig == "0" ? ZYGISKLDR : ZYGISKLDR + native_bridge_orig;
set_prop(NBPROP, zygisk_lib_name.data());
// Whether Huawei's Maple compiler is enabled.
// If so, system server will be created by a special Zygote which ignores the native bridge
// and make system server out of our control. Avoid it by disabling.
if (get_prop("ro.maple.enable") == "1") {
set_prop("ro.maple.enable", "0");
}
}
void restore_zygisk_prop() {
string native_bridge_orig = "0";
if (native_bridge.length() > strlen(ZYGISKLDR)) {
native_bridge_orig = native_bridge.substr(strlen(ZYGISKLDR));
if (zygisk_lib_name.length() > strlen(ZYGISKLDR)) {
native_bridge_orig = zygisk_lib_name.substr(strlen(ZYGISKLDR));
}
set_prop(NBPROP, native_bridge_orig.data());
}

3
native/src/core/zygisk/zygisk.hpp
View File

@ -3,6 +3,9 @@
#include <jni.h>
#include <core.hpp>
#define ZYGISKLDR "libzygisk.so"
#define NBPROP "ro.dalvik.vm.native.bridge"
#if defined(__LP64__)
#define ZLOGD(...) LOGD("zygisk64: " __VA_ARGS__)
#define ZLOGE(...) LOGE("zygisk64: " __VA_ARGS__)

2
native/src/include/consts.hpp
View File

@ -1,8 +1,6 @@
#pragma once
#define JAVA_PACKAGE_NAME "com.topjohnwu.magisk"
#define ZYGISKLDR "libzygisk.so"
#define NBPROP "ro.dalvik.vm.native.bridge"
#define SECURE_DIR "/data/adb"
#define MODULEROOT SECURE_DIR "/modules"
#define MODULEUPGRADE SECURE_DIR "/modules_update"