TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-12 06:52:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tmpfs path static strings

Browse Source
This commit is contained in:
topjohnwu
2023-10-29 00:47:28 -07:00
parent 67cc36268e
commit 19a4e11645
5 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
native/src/core/daemon.cpp
View File

@@ -411,27 +411,25 @@ static void daemon_entry() {
poll_loop();
}
string find_magisk_tmp() {
if (access("/debug_ramdisk/" INTLROOT, F_OK) == 0) {
return "/debug_ramdisk";
}
if (access("/sbin/" INTLROOT, F_OK) == 0) {
return "/sbin";
}
// Fallback to lookup from mountinfo for manual mount, e.g. avd
for (const auto &mount: parse_mount_info("self")) {
if (mount.source == "magisk" && mount.root == "/") {
return mount.target;
const char *get_magisk_tmp() {
static const char *path = nullptr;
if (path == nullptr) {
if (access("/debug_ramdisk/" INTLROOT, F_OK) == 0) {
path = "/debug_ramdisk";
} else if (access("/sbin/" INTLROOT, F_OK) == 0) {
path = "/sbin";
} else {
path = "";
}
}
return "";
return path;
}
int connect_daemon(int req, bool create) {
int fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
sockaddr_un addr = {.sun_family = AF_LOCAL};
string tmp = find_magisk_tmp();
strcpy(addr.sun_path, (tmp + "/" MAIN_SOCKET).data());
const char *tmp = get_magisk_tmp();
ssprintf(addr.sun_path, sizeof(addr.sun_path), "%s/" MAIN_SOCKET, tmp);
if (connect(fd, (sockaddr *) &addr, sizeof(addr))) {
if (!create || getuid() != AID_ROOT) {
LOGE("No daemon is currently running!\n");
@@ -441,7 +439,7 @@ int connect_daemon(int req, bool create) {
char buf[64];
xreadlink("/proc/self/exe", buf, sizeof(buf));
if (tmp.empty() || !str_starts(buf, tmp)) {
if (tmp[0] == '\0' || !str_starts(buf, tmp)) {
LOGE("Start daemon on magisk tmpfs\n");
close(fd);
return -1;

6
native/src/core/magisk.cpp
View File

@@ -129,9 +129,9 @@ int magisk_main(int argc, char *argv[]) {
write_int(fd, do_reboot);
return read_int(fd);
} else if (argv[1] == "--path"sv) {
string path = find_magisk_tmp();
if (!path.empty()) {
printf("%s\n", path.data());
const char *path = get_magisk_tmp();
if (path[0] != '\0') {
printf("%s\n", path);
return 0;
}
return 1;

2
native/src/include/daemon.hpp
View File

@@ -71,7 +71,7 @@ extern int app_process_32;
extern int app_process_64;
extern std::vector<module_info> *module_list;
std::string find_magisk_tmp();
const char *get_magisk_tmp();
int connect_daemon(int req, bool create = false);
// Poll control

1
native/src/include/magisk.hpp
View File

@@ -3,7 +3,6 @@
#include <string>
#define JAVA_PACKAGE_NAME "com.topjohnwu.magisk"
#define LOGFILE "/cache/magisk.log"
#define SECURE_DIR "/data/adb"
#define MODULEROOT SECURE_DIR "/modules"
#define MODULEUPGRADE SECURE_DIR "/modules_update"