TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-18 15:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly detect 2SI init

Browse Source 
Fix #2994
This commit is contained in:
topjohnwu
2020-09-02 21:20:00 -07:00
parent b73d5753f2
commit f32a29911b
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/init/init.hpp
View File

@@ -21,12 +21,12 @@ struct data_holder {
size_t sz = 0;
using str_pairs = std::initializer_list<std::pair<std::string_view, std::string_view>>;
int patch(str_pairs list);
bool find(std::string_view pattern);
protected:
void consume(data_holder &other);
};
enum data_type { HEAP, MMAP };
template <data_type T>
struct auto_data : public data_holder {
auto_data<T>() = default;
@@ -35,11 +35,14 @@ struct auto_data : public data_holder {
~auto_data<T>() {}
auto_data<T>& operator=(auto_data<T> &&other) { consume(other); return *this; }
};
template <> inline auto_data<MMAP>::~auto_data<MMAP>() { if (buf) munmap(buf, sz); }
template <> inline auto_data<HEAP>::~auto_data<HEAP>() { free(buf); }
namespace raw_data {
auto_data<HEAP> read(const char *name);
auto_data<HEAP> read(int fd);
auto_data<MMAP> mmap_rw(const char *name);
auto_data<MMAP> mmap_ro(const char *name);
}
struct fstab_entry {
@@ -59,6 +62,7 @@ struct fstab_entry {
#define DEFAULT_DT_DIR "/proc/device-tree/firmware/android"
void load_kernel_info(cmdline *cmd);
bool check_two_stage();
int dump_magisk(const char *path, mode_t mode);
int magisk_proxy_main(int argc, char *argv[]);
void setup_klog();