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 mmap block device

Browse Source
This commit is contained in:
LoveSy 2023-06-25 07:21:35 +08:00 committed by John Wu
parent ff1c56683d
commit a470ee6f93
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
native/src/base/files.hpp
View File

@ -6,6 +6,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <linux/fs.h>
#include "misc.hpp" #include "misc.hpp"
template <typename T> template <typename T>
@ -42,6 +43,8 @@ struct mount_info {
}; };
struct mmap_data : public byte_data { struct mmap_data : public byte_data {
static_assert((sizeof(void *) == 8 && BLKGETSIZE64 == 0x80081272) ||
(sizeof(void *) == 4 && BLKGETSIZE64 == 0x80041272));
ALLOW_MOVE_ONLY(mmap_data) ALLOW_MOVE_ONLY(mmap_data)
explicit mmap_data(const char *name, bool rw = false); explicit mmap_data(const char *name, bool rw = false);

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

@ -483,8 +483,12 @@ pub(crate) fn map_file(path: &Utf8CStr, rw: bool) -> io::Result<&'static mut [u8
fn ioctl(fd: RawFd, request: u32, ...) -> i32; fn ioctl(fd: RawFd, request: u32, ...) -> i32;
} }
#[cfg(target_pointer_width = "64")]
const BLKGETSIZE64: u32 = 0x80081272; const BLKGETSIZE64: u32 = 0x80081272;
#[cfg(target_pointer_width = "32")]
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 f = File::from(open_fd!(path, flag | O_CLOEXEC)?);