br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

improve: code readability; fix: not properly starting up companions

Browse Source 
This commit both improves the code readability and also fixes a bug that wouln't start companions properly.
This commit is contained in:
ThePedroo
2024-07-24 14:40:03 -03:00
parent da68db8a9a
commit 5d0adacf4a
4 changed files with 35 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
zygiskd-new/companion.c
View File

@@ -67,14 +67,9 @@ void *ExecuteNew(void *arg) {
void entry(int fd) {
LOGI("Previous error (2): %s\n", strerror(errno));
LOGI("companion entry fd: |%d|\n", fd);
LOGI("Reading name length\n");
char name[256 + 1];
LOGI("Previous error(6): %s\n", strerror(errno));
/* INFO: Getting stuck here */
ssize_t ret = read_string(fd, name, sizeof(name) - 1);
@@ -84,47 +79,47 @@ void entry(int fd) {
LOGI("Companion process requested for `%s`\n", name);
// int library_fd;
// recv_fd(fd, &library_fd);
int library_fd;
recv_fd(fd, &library_fd);
// LOGI("Library fd: %d\n", library_fd);
LOGI("Library fd: %d\n", library_fd);
// ZygiskCompanionEntryFn entry = load_module(library_fd);
ZygiskCompanionEntryFn entry = load_module(library_fd);
// LOGI("Library loaded\n");
LOGI("Library loaded\n");
// close(library_fd);
close(library_fd);
// LOGI("Library closed\n");
LOGI("Library closed\n");
// if (entry == NULL) {
// LOGI("No companion entry for: %s\n", name);
if (entry == NULL) {
LOGI("No companion entry for: %s\n", name);
// write(fd, (void *)0, 1);
write(fd, (void *)0, 1);
// return;
// }
return;
}
// LOGI("Companion process created for: %s\n", name);
LOGI("Companion process created for: %s\n", name);
// write(fd, (void *)1, 1);
uint8_t response = 1;
write(fd, &response, sizeof(response));
// while (1) {
// int client_fd;
// recv_fd(fd, &client_fd);
while (1) {
int client_fd;
recv_fd(fd, &client_fd);
// LOGI("New companion request from module \"%s\" with fd \"%d\"\n", name, client_fd);
LOGI("New companion request from module \"%s\" with fd \"%d\"\n", name, client_fd);
// int response = 1;
// write(fd, (void *)&response, sizeof(response));
write(fd, &response, sizeof(response));
// int *client_fd_ptr = malloc(sizeof(int));
// *client_fd_ptr = client_fd;
int *client_fd_ptr = malloc(sizeof(int));
*client_fd_ptr = client_fd;
// LOGI("Creating new thread for companion request\n");
LOGI("Creating new thread for companion request\n");
// pthread_t thread;
// pthread_create(&thread, NULL, ExecuteNew, (void *)client_fd_ptr);
// pthread_detach(thread);
// }
pthread_t thread;
pthread_create(&thread, NULL, ExecuteNew, (void *)client_fd_ptr);
pthread_detach(thread);
}
}

7
zygiskd-new/main.c
View File

@@ -31,11 +31,7 @@ int main(int argc, char *argv[]) {
return 1;
}
LOGI("Previous error{3}: %s\n", strerror(errno));
int fd = atoi(argv[2]);
LOGI("Previous error(4): %s\n", strerror(errno));
entry(fd);
return 0;
@@ -82,11 +78,8 @@ int main(int argc, char *argv[]) {
}
}
LOGI("Previous error{27}: %s\n", strerror(errno));
switch_mount_namespace((pid_t)1);
LOGI("Previous error{28}: %s\n", strerror(errno));
root_impls_setup();
LOGI("Previous error{29}: %s\n", strerror(errno));
zygiskd_start();
return 0;

5
zygiskd-new/utils.c
View File

@@ -269,12 +269,7 @@ ssize_t write_string(int fd, const char *str) {
ssize_t read_string(int fd, char *str, size_t len) {
size_t str_len_buf[1];
LOGI("Reading string length from fd %d\n", fd);
LOGI("Previous error: %s\n", strerror(errno));
ssize_t read_bytes = read(fd, &str_len_buf, sizeof(str_len_buf));
LOGI("Read %zd bytes\n", read_bytes);
if (read_bytes != (ssize_t)sizeof(str_len_buf)) {
LOGE("Failed to read string length: %s\n", strerror(errno));

48
zygiskd-new/zygiskd.c
View File

@@ -148,8 +148,6 @@ static void load_modules(enum Architecture arch, struct Context *context) {
context->len = 0;
context->modules = malloc(1);
// LOGI("Previous error{25}: %s\n", strerror(errno));
DIR *dir = opendir(PATH_MODULES_DIR);
if (dir == NULL) {
LOGE("Failed opening modules directory: %s.", PATH_MODULES_DIR);
@@ -157,8 +155,6 @@ static void load_modules(enum Architecture arch, struct Context *context) {
return;
}
// LOGI("Previous error{27}: %s\n", strerror(errno));
char arch_str[32];
switch (arch) {
case ARM32: {
@@ -184,11 +180,9 @@ static void load_modules(enum Architecture arch, struct Context *context) {
}
LOGI("Loading modules for architecture: %s\n", arch_str);
// LOGI("Previous error{28}: %s\n", strerror(errno));
struct dirent *entry;
while ((entry = readdir(dir)) != NULL) {
// LOGI("Previous error{29}: %s\n", strerror(errno));
if (entry->d_type != DT_DIR) continue; /* INFO: Only directories */
if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0 || strcmp(entry->d_name, "zygisksu") == 0) continue;
@@ -244,8 +238,6 @@ static int create_daemon_socket(void) {
}
static int spawn_companion(char *name, int lib_fd) {
// LOGI("Previous error{15}: %s\n", strerror(errno));
int sockets[2];
if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) == -1) {
LOGE("Failed creating socket pair.\n");
@@ -259,8 +251,6 @@ static int spawn_companion(char *name, int lib_fd) {
LOGI("Companion fd: %d\n", companion_fd);
LOGI("Daemon fd: %d\n", daemon_fd);
// LOGI("Previous error{13}: %s\n", strerror(errno));
pid_t pid = fork();
LOGI("Forked: %d\n", pid);
if (pid < 0) {
@@ -271,20 +261,16 @@ static int spawn_companion(char *name, int lib_fd) {
exit(1);
} else if (pid > 0) {
// LOGI("Previous error{11}: %s\n", strerror(errno));
close(companion_fd);
LOGI("Waiting for companion to start (%d)\n", pid);
// LOGI("Previous error{8}: %s\n", strerror(errno));
int status;
waitpid(pid, &status, 0);
int status = 0;
// waitpid(pid, &status, 0);
LOGI("Companion exited with status %d\n", status);
// LOGI("Previous error{9}: %s\n", strerror(errno));
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
// if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
if (write_string(daemon_fd, name) == -1) return -1;
if (send_fd(daemon_fd, lib_fd) == -1) return -1;
@@ -302,13 +288,13 @@ static int spawn_companion(char *name, int lib_fd) {
if (response == 0) return -2;
else if (response == 1) return daemon_fd;
else return -2;
} else {
LOGE("Exited with status %d\n", status);
// } else {
// LOGE("Exited with status %d\n", status);
close(daemon_fd);
// close(daemon_fd);
return -1;
}
// return -1;
// }
/* INFO: if pid == 0: */
} else {
LOGI("Companion started (%d)\n", pid);
@@ -320,7 +306,6 @@ static int spawn_companion(char *name, int lib_fd) {
snprintf(companion_fd_str, 32, "%d", companion_fd);
LOGI("Executing companion...\n");
// LOGI("Previous error{10}: %s\n", strerror(errno));
char *argv[] = { ZYGISKD_FILE, "companion", companion_fd_str, NULL };
if (execv(ZYGISKD_PATH, argv) == -1) {
@@ -344,20 +329,14 @@ struct __attribute__((__packed__)) MsgHead {
void zygiskd_start(void) {
LOGI("Welcome to ReZygisk %s!", ZKSU_VERSION);
// LOGI("Previous error{26}: %s\n", strerror(errno));
enum Architecture arch = get_arch();
// LOGI("Previous error{25}: %s\n", strerror(errno));
struct Context context;
load_modules(arch, &context);
struct MsgHead *msg = NULL;
size_t msg_sz = 0;
// LOGI("Previous error{24}: %s\n", strerror(errno));
switch (get_impl()) {
case None: {
/* INFO: Stop, compiler. */
@@ -425,14 +404,10 @@ void zygiskd_start(void) {
}
}
// LOGI("Previous error{22}: %s\n", strerror(errno));
unix_datagram_sendto(CONTROLLER_SOCKET, (void *)msg, msg_sz);
free(msg);
// LOGI("Previous error{21}: %s\n", strerror(errno));
int socket_fd = create_daemon_socket();
if (socket_fd == -1) {
LOGE("Failed creating daemon socket\n");
@@ -441,7 +416,6 @@ void zygiskd_start(void) {
}
while (1) {
// LOGI("Previous error{20}: %s\n", strerror(errno));
int client_fd = accept(socket_fd, NULL, NULL);
if (client_fd == -1) {
LOGE("accept: %s\n", strerror(errno));
@@ -451,8 +425,6 @@ void zygiskd_start(void) {
LOGI("Accepted client: %d\n", client_fd);
// LOGI("Previous error{19}: %s\n", strerror(errno));
unsigned char buf[1];
ssize_t len = read(client_fd, buf, sizeof(buf));
if (len == -1) {
@@ -627,15 +599,11 @@ void zygiskd_start(void) {
}
case RequestCompanionSocket: {
LOGI("Requesting companion socket\n");
// LOGI("Previous error{17}: %s\n", strerror(errno));
size_t index_buf[1];
ssize_t ret = read(client_fd, &index_buf, sizeof(index_buf));
ASSURE_SIZE_READ_BREAK("RequestCompanionSocket", "index", ret, sizeof(index_buf));
// LOGI("Previous error{16}: %s\n", strerror(errno));
size_t index = index_buf[0];
struct Module *module = &context.modules[index];