TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 21:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

No need to dup fd

Browse Source
This commit is contained in:
topjohnwu 2021-11-12 01:54:48 -08:00
parent 528601d25a
commit 56988944b5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/jni/zygisk/main.cpp
View File

@ -149,20 +149,18 @@ static void zygiskd(int socket) {
int module_id = read_int(client); int module_id = read_int(client);
if (module_id >= 0 && module_id < modules.size() && modules[module_id]) { if (module_id >= 0 && module_id < modules.size() && modules[module_id]) {
exec_task([=, entry = modules[module_id]] { exec_task([=, entry = modules[module_id]] {
int dup = fcntl(client, F_DUPFD_CLOEXEC); struct stat s1;
fstat(client, &s1);
entry(client); entry(client);
// Only close client if it is the same as dup so we don't // Only close client if it is the same file so we don't
// accidentally close a re-used file descriptor. // accidentally close a re-used file descriptor.
// This check is required because the module companion // This check is required because the module companion
// handler could've closed the file descriptor already. // handler could've closed the file descriptor already.
if (struct stat s1; fstat(client, &s1) == 0) { if (struct stat s2; fstat(client, &s2) == 0) {
struct stat s2{};
fstat(dup, &s2);
if (s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino) { if (s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino) {
close(client); close(client);
} }
} }
close(dup);
}); });
} else { } else {
close(client); close(client);