Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-30 14:34:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix 2SI on legacy SAR devices

Browse Source
This commit is contained in:
topjohnwu 2025-03-24 15:10:26 -07:00 committed by John Wu
parent a396abf565
commit 0bbfe7f44d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
native/src/init/twostage.rs
View File

@ -1,11 +1,11 @@
use crate::ffi::MagiskInit; use crate::ffi::MagiskInit;
use base::{ use base::{
clone_attr, cstr, debug, error, info, LibcReturn, LoggedResult, MappedFile, MutBytesExt, ResultExt, cstr, debug, error, info,
libc::{ libc::{
mount, statfs, umount2, MNT_DETACH, MS_BIND, O_CLOEXEC, MNT_DETACH, MS_BIND, O_CLOEXEC, O_CREAT, O_RDONLY, O_WRONLY, TMPFS_MAGIC, mount, statfs,
O_CREAT, O_RDONLY, O_WRONLY, TMPFS_MAGIC, umount2,
}, },
path, raw_cstr, LibcReturn, MappedFile, MutBytesExt, ResultExt, path, raw_cstr,
}; };
use std::{ffi::c_long, io::Write, ptr::null}; use std::{ffi::c_long, io::Write, ptr::null};
@ -113,12 +113,13 @@ impl MagiskInit {
error!("Failed to open {} for hexpatch", src); error!("Failed to open {} for hexpatch", src);
} }
} }
clone_attr(src, dest).log_ok(); let _: LoggedResult<()> = try {
unsafe { let attr = src.follow_link().get_attr()?;
mount(dest.as_ptr(), src.as_ptr(), null(), MS_BIND, null()) dest.set_attr(&attr)?;
.as_os_err() unsafe {
.ok(); mount(dest.as_ptr(), src.as_ptr(), null(), MS_BIND, null()).as_os_err()?;
} }
};
} }
pub(crate) fn second_stage(&mut self) { pub(crate) fn second_stage(&mut self) {