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

Treat bind mount failure same as C++ implementation

Browse Source 
This fixes #9139 and #9174.
This commit is contained in:
Wang Han 2025-07-12 23:49:59 +08:00 committed by John Wu
parent e472db552b
commit 62e29fee74
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,10 @@ macro_rules! module_log {
#[allow(unused_variables)] #[allow(unused_variables)]
fn bind_mount(reason: &str, src: &Utf8CStr, dest: &Utf8CStr, rec: bool) -> OsResultStatic<()> { fn bind_mount(reason: &str, src: &Utf8CStr, dest: &Utf8CStr, rec: bool) -> OsResultStatic<()> {
module_log!(reason, dest, src); module_log!(reason, dest, src);
src.bind_mount_to(dest, rec)?; // Ignore any kind of error here. If a single bind mount fails due to selinux permissions or
dest.remount_mount_point_flags(MS_RDONLY)?; // kernel limitations, don't let it break module mount entirely.
src.bind_mount_to(dest, rec).log_ok();
dest.remount_mount_point_flags(MS_RDONLY).log_ok();
Ok(()) Ok(())
} }
@ -510,7 +512,7 @@ fn inject_zygisk_bins(system: &mut FsNode) {
#[cfg(target_pointer_width = "32")] #[cfg(target_pointer_width = "32")]
bin_path.append_path("magisk"); bin_path.append_path("magisk");
// There are some devices that announce ABI as 64 bit only, but ship with linker64 // There are some devices that announce ABI as 64 bit only, but ship with linker
// because they make use of a special 32 bit to 64 bit translator (such as tango). // because they make use of a special 32 bit to 64 bit translator (such as tango).
// In this case, magisk32 does not exist, so inserting it will cause bind mount // In this case, magisk32 does not exist, so inserting it will cause bind mount
// failure and affect module mount. Native bridge injection does not support these // failure and affect module mount. Native bridge injection does not support these