TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7988

Browse Source
This commit is contained in:
topjohnwu 2024-04-16 19:45:01 -07:00
parent b22b6a4204
commit 7c88484d64
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/src/base/files.rs
View File

@ -155,7 +155,7 @@ impl FileAttr {
#[inline(always)] #[inline(always)]
#[allow(clippy::unnecessary_cast)] #[allow(clippy::unnecessary_cast)]
fn is(&self, mode: mode_t) -> bool { fn is(&self, mode: mode_t) -> bool {
(self.st.st_mode & libc::S_IFMT as u32) as mode_t == mode (self.st.st_mode & libc::S_IFMT as c_uint) as mode_t == mode
} }
pub fn is_dir(&self) -> bool { pub fn is_dir(&self) -> bool {
@ -895,18 +895,18 @@ pub(crate) fn map_file(path: &Utf8CStr, rw: bool) -> io::Result<&'static mut [u8
const BLKGETSIZE64: u32 = 0x80041272; const BLKGETSIZE64: u32 = 0x80041272;
let flag = if rw { O_RDWR } else { O_RDONLY }; let flag = if rw { O_RDWR } else { O_RDONLY };
let f = File::from(open_fd!(path, flag | O_CLOEXEC)?); let file = FsPath::from(path).open(flag | O_CLOEXEC)?;
let attr = FsPath::from(path).get_attr()?; let attr = fd_get_attr(file.as_raw_fd())?;
let sz = if attr.is_block_device() { let sz = if attr.is_block_device() {
let mut sz = 0_u64; let mut sz = 0_u64;
unsafe { ioctl(f.as_raw_fd(), BLKGETSIZE64, &mut sz) }.as_os_err()?; unsafe { ioctl(file.as_raw_fd(), BLKGETSIZE64, &mut sz) }.as_os_err()?;
sz sz
} else { } else {
attr.st.st_size as u64 attr.st.st_size as u64
}; };
map_fd(f.as_fd(), sz as usize, rw) map_fd(file.as_fd(), sz as usize, rw)
} }
pub(crate) fn map_fd(fd: BorrowedFd, sz: usize, rw: bool) -> io::Result<&'static mut [u8]> { pub(crate) fn map_fd(fd: BorrowedFd, sz: usize, rw: bool) -> io::Result<&'static mut [u8]> {

3
native/src/boot/cpio.rs
View File

@ -407,7 +407,8 @@ impl Cpio {
let rdevmajor: dev_t; let rdevmajor: dev_t;
let rdevminor: dev_t; let rdevminor: dev_t;
let mode = if attr.is_file() { // Treat symlinks as regular files as symlinks are created by the 'ln TARGET ENTRY' command
let mode = if attr.is_file() || attr.is_symlink() {
rdevmajor = 0; rdevmajor = 0;
rdevminor = 0; rdevminor = 0;
file.open(O_RDONLY | O_CLOEXEC)?.read_to_end(&mut content)?; file.open(O_RDONLY | O_CLOEXEC)?.read_to_end(&mut content)?;