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

Avoid hardcoding max fd size

Browse Source 
Android changed max fd limit to 32768 since Android 9:
cb5fccc83c

Co-authored-by: LoveSy <shana@zju.edu.cn>
This commit is contained in:
Wang Han 2025-01-19 11:54:26 +08:00 committed by GitHub
parent 049db49dc8
commit d9c2bffc9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/src/core/zygisk/hook.cpp
View File

@ -1,4 +1,5 @@
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/resource.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <unwind.h> #include <unwind.h>
#include <span> #include <span>
@ -217,6 +218,7 @@ DCL_HOOK_FUNC(static int, pthread_attr_destroy, void *target) {
ZygiskContext::ZygiskContext(JNIEnv *env, void *args) : ZygiskContext::ZygiskContext(JNIEnv *env, void *args) :
env(env), args{args}, process(nullptr), pid(-1), flags(0), info_flags(0), env(env), args{args}, process(nullptr), pid(-1), flags(0), info_flags(0),
allowed_fds([] static { rlimit r{32768, 32768}; getrlimit(RLIMIT_NOFILE, &r); return r.rlim_max; }()),
hook_info_lock(PTHREAD_MUTEX_INITIALIZER) { g_ctx = this; } hook_info_lock(PTHREAD_MUTEX_INITIALIZER) { g_ctx = this; }
ZygiskContext::~ZygiskContext() { ZygiskContext::~ZygiskContext() {

8
native/src/core/zygisk/module.cpp
View File

@ -226,7 +226,7 @@ void ZygiskContext::sanitize_fds() {
env->SetIntArrayRegion( env->SetIntArrayRegion(
array, old_len, static_cast<int>(exempted_fds.size()), exempted_fds.data()); array, old_len, static_cast<int>(exempted_fds.size()), exempted_fds.data());
for (int fd : exempted_fds) { for (int fd : exempted_fds) {
if (fd >= 0 && fd < MAX_FD_SIZE) { if (fd >= 0 && fd < allowed_fds.size()) {
allowed_fds[fd] = true; allowed_fds[fd] = true;
} }
} }
@ -239,7 +239,7 @@ void ZygiskContext::sanitize_fds() {
int len = env->GetArrayLength(fdsToIgnore); int len = env->GetArrayLength(fdsToIgnore);
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
int fd = arr[i]; int fd = arr[i];
if (fd >= 0 && fd < MAX_FD_SIZE) { if (fd >= 0 && fd < allowed_fds.size()) {
allowed_fds[fd] = true; allowed_fds[fd] = true;
} }
} }
@ -257,7 +257,7 @@ void ZygiskContext::sanitize_fds() {
int dfd = dirfd(dir.get()); int dfd = dirfd(dir.get());
for (dirent *entry; (entry = xreaddir(dir.get()));) { for (dirent *entry; (entry = xreaddir(dir.get()));) {
int fd = parse_int(entry->d_name); int fd = parse_int(entry->d_name);
if ((fd < 0 || fd >= MAX_FD_SIZE || !allowed_fds[fd]) && fd != dfd) { if ((fd < 0 || fd >= allowed_fds.size() || !allowed_fds[fd]) && fd != dfd) {
close(fd); close(fd);
} }
} }
@ -296,7 +296,7 @@ void ZygiskContext::fork_pre() {
auto dir = xopen_dir("/proc/self/fd"); auto dir = xopen_dir("/proc/self/fd");
for (dirent *entry; (entry = xreaddir(dir.get()));) { for (dirent *entry; (entry = xreaddir(dir.get()));) {
int fd = parse_int(entry->d_name); int fd = parse_int(entry->d_name);
if (fd < 0 || fd >= MAX_FD_SIZE) { if (fd < 0 || fd >= allowed_fds.size()) {
close(fd); close(fd);
continue; continue;
} }

4
native/src/core/zygisk/module.hpp
View File

@ -224,8 +224,6 @@ enum : uint32_t {
SKIP_CLOSE_LOG_PIPE = (1u << 5), SKIP_CLOSE_LOG_PIPE = (1u << 5),
}; };
#define MAX_FD_SIZE 1024
#define DCL_PRE_POST(name) \ #define DCL_PRE_POST(name) \
void name##_pre(); \ void name##_pre(); \
void name##_post(); void name##_post();
@ -244,7 +242,7 @@ struct ZygiskContext {
int pid; int pid;
uint32_t flags; uint32_t flags;
uint32_t info_flags; uint32_t info_flags;
std::bitset<MAX_FD_SIZE> allowed_fds; std::vector<bool> allowed_fds;
std::vector<int> exempted_fds; std::vector<int> exempted_fds;
struct RegisterInfo { struct RegisterInfo {