TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 12:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor bug fixes

Browse Source
This commit is contained in:
topjohnwu 2021-08-22 02:11:48 -07:00
parent 171d68ca72
commit b591af7803
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/core/daemon.cpp
View File

@ -264,7 +264,7 @@ int connect_daemon(bool create) {
if (connect(fd, (sockaddr*) &sun, len)) { if (connect(fd, (sockaddr*) &sun, len)) {
if (!create || getuid() != UID_ROOT) { if (!create || getuid() != UID_ROOT) {
LOGE("No daemon is currently running!\n"); LOGE("No daemon is currently running!\n");
return 1; return -1;
} }
if (fork_dont_care() == 0) { if (fork_dont_care() == 0) {

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

@ -236,11 +236,11 @@ int remote_request_unmount() {
// The following code runs in magiskd // The following code runs in magiskd
static void setup_files(int client, ucred *cred) { static void setup_files(int client, ucred *cred) {
LOGD("zygisk: setup files\n"); LOGD("zygisk: setup files for pid=[%d]\n", cred->pid);
char buf[PATH_MAX]; char buf[256];
sprintf(buf, "/proc/%d/exe", cred->pid); snprintf(buf, sizeof(buf), "/proc/%d/exe", cred->pid);
if (realpath(buf, buf) == nullptr) { if (xreadlink(buf, buf, sizeof(buf)) < 0) {
write_int(client, 1); write_int(client, 1);
return; return;
} }
@ -276,7 +276,7 @@ static void do_unmount(int client, ucred *cred) {
static void send_log_pipe(int fd) { static void send_log_pipe(int fd) {
// There is race condition here, but we can't really do much about it... // There is race condition here, but we can't really do much about it...
if (logd_fd) { if (logd_fd >= 0) {
write_int(fd, 0); write_int(fd, 0);
send_fd(fd, logd_fd); send_fd(fd, logd_fd);
} else { } else {