Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c282a8f3
Commit
c282a8f3
authored
Jun 02, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Loop for every for logging
parent
b9eab395
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
92 additions
and
77 deletions
+92
-77
log_monitor.c
jni/daemon/log_monitor.c
+18
-8
magisk.h
jni/magisk.h
+1
-0
hide_daemon.c
jni/magiskhide/hide_daemon.c
+1
-1
magiskhide.h
jni/magiskhide/magiskhide.h
+0
-3
proc_monitor.c
jni/magiskhide/proc_monitor.c
+66
-59
misc.c
jni/utils/misc.c
+6
-6
No files found.
jni/daemon/log_monitor.c
View file @
c282a8f3
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
#include <limits.h>
#include <limits.h>
#include <pthread.h>
#include <pthread.h>
#include <unistd.h>
#include <unistd.h>
#include <sys/wait.h>
#include "magisk.h"
#include "magisk.h"
#include "utils.h"
#include "utils.h"
...
@@ -23,17 +24,26 @@ static void *logger_thread(void *args) {
...
@@ -23,17 +24,26 @@ static void *logger_thread(void *args) {
FILE
*
logfile
=
xfdopen
(
xopen
(
LOGFILE
,
O_WRONLY
|
O_CREAT
|
O_CLOEXEC
|
O_TRUNC
,
0644
),
"w"
);
FILE
*
logfile
=
xfdopen
(
xopen
(
LOGFILE
,
O_WRONLY
|
O_CREAT
|
O_CLOEXEC
|
O_TRUNC
,
0644
),
"w"
);
// Disable buffering
// Disable buffering
setbuf
(
logfile
,
NULL
);
setbuf
(
logfile
,
NULL
);
// Start logcat
int
fd
,
log_pid
;
char
*
const
command
[]
=
{
"logcat"
,
"-s"
,
"Magisk"
,
"-v"
,
"time"
,
NULL
};
int
fd
;
while
(
1
)
{
run_command
(
&
fd
,
"/system/bin/logcat"
,
command
);
// Start logcat
while
(
fdgets
(
buffer
,
PATH_MAX
,
fd
))
{
char
*
const
command
[]
=
{
"logcat"
,
"-s"
,
"Magisk"
,
"-v"
,
"time"
,
NULL
};
fprintf
(
logfile
,
"%s"
,
buffer
);
log_pid
=
run_command
(
&
fd
,
"/system/bin/logcat"
,
command
);
while
(
fdgets
(
buffer
,
PATH_MAX
,
fd
))
{
fprintf
(
logfile
,
"%s"
,
buffer
);
}
// For some reason it went here, clear buffer and restart
close
(
fd
);
kill
(
log_pid
,
SIGTERM
);
waitpid
(
log_pid
,
NULL
,
0
);
system
(
"logcat -c"
);
}
}
// Should never be here, but well...
// Should never be here, but well...
free
(
buffer
);
close
(
fd
);
fclose
(
logfile
);
fclose
(
logfile
);
free
(
buffer
);
return
NULL
;
return
NULL
;
}
}
...
...
jni/magisk.h
View file @
c282a8f3
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
#define MOUNTPOINT "/magisk"
#define MOUNTPOINT "/magisk"
#define COREDIR MOUNTPOINT "/.core"
#define COREDIR MOUNTPOINT "/.core"
#define HOSTSFILE COREDIR "/hosts"
#define HOSTSFILE COREDIR "/hosts"
#define HIDELIST COREDIR "/hidelist"
#define MAINIMG "/data/magisk.img"
#define MAINIMG "/data/magisk.img"
#define DATABIN "/data/magisk"
#define DATABIN "/data/magisk"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MANAGERAPK DATABIN "/magisk.apk"
...
...
jni/magiskhide/hide_daemon.c
View file @
c282a8f3
...
@@ -113,7 +113,7 @@ int hide_daemon() {
...
@@ -113,7 +113,7 @@ int hide_daemon() {
// Unmount loop mounts
// Unmount loop mounts
vec_for_each_r
(
&
mount_list
,
line
)
{
vec_for_each_r
(
&
mount_list
,
line
)
{
if
(
strstr
(
line
,
"/dev/block/loop"
)
&&
!
strstr
(
line
,
DUMM
YPATH
))
{
if
(
strstr
(
line
,
"/dev/block/loop"
)
&&
!
strstr
(
line
,
DUMM
DIR
))
{
sscanf
(
line
,
"%*s %512s"
,
buffer
);
sscanf
(
line
,
"%*s %512s"
,
buffer
);
lazy_unmount
(
buffer
);
lazy_unmount
(
buffer
);
}
}
...
...
jni/magiskhide/magiskhide.h
View file @
c282a8f3
...
@@ -3,9 +3,6 @@
...
@@ -3,9 +3,6 @@
#include <pthread.h>
#include <pthread.h>
#define HIDELIST "/magisk/.core/magiskhide/hidelist"
#define DUMMYPATH "/dev/magisk/dummy"
// Kill process
// Kill process
void
kill_proc
(
int
pid
);
void
kill_proc
(
int
pid
);
...
...
jni/magiskhide/proc_monitor.c
View file @
c282a8f3
...
@@ -101,75 +101,82 @@ void proc_monitor() {
...
@@ -101,75 +101,82 @@ void proc_monitor() {
break
;
break
;
}
}
// Monitor am_proc_start
while
(
1
)
{
system
(
"logcat -b events -c"
);
// Clear previous buffer
char
*
const
command
[]
=
{
"logcat"
,
"-b"
,
"events"
,
"-v"
,
"raw"
,
"-s"
,
"am_proc_start"
,
NULL
};
system
(
"logcat -b events -c"
);
log_pid
=
run_command
(
&
log_fd
,
"/system/bin/logcat"
,
command
);
// Monitor am_proc_start
while
(
fdgets
(
buffer
,
PATH_MAX
,
log_fd
))
{
char
*
const
command
[]
=
{
"logcat"
,
"-b"
,
"events"
,
"-v"
,
"raw"
,
"-s"
,
"am_proc_start"
,
NULL
};
int
ret
,
comma
=
0
;
log_pid
=
run_command
(
&
log_fd
,
"/system/bin/logcat"
,
command
);
char
*
pos
=
buffer
,
*
line
,
processName
[
256
];
while
(
fdgets
(
buffer
,
PATH_MAX
,
log_fd
))
{
while
(
1
)
{
int
ret
,
comma
=
0
;
pos
=
strchr
(
pos
,
','
);
char
*
pos
=
buffer
,
*
line
,
processName
[
256
];
if
(
pos
==
NULL
)
break
;
while
(
1
)
{
pos
[
0
]
=
' '
;
pos
=
strchr
(
pos
,
','
);
++
comma
;
if
(
pos
==
NULL
)
}
break
;
pos
[
0
]
=
' '
;
++
comma
;
}
if
(
comma
==
6
)
if
(
comma
==
6
)
ret
=
sscanf
(
buffer
,
"[%*d %d %*d %*d %256s"
,
&
pid
,
processName
);
ret
=
sscanf
(
buffer
,
"[%*d %d %*d %*d %256s"
,
&
pid
,
processName
);
else
else
ret
=
sscanf
(
buffer
,
"[%*d %d %*d %256s"
,
&
pid
,
processName
);
ret
=
sscanf
(
buffer
,
"[%*d %d %*d %256s"
,
&
pid
,
processName
);
if
(
ret
!=
2
)
if
(
ret
!=
2
)
continue
;
continue
;
ret
=
0
;
ret
=
0
;
// Critical region
// Critical region
pthread_mutex_lock
(
&
hide_lock
);
pthread_mutex_lock
(
&
hide_lock
);
vec_for_each
(
hide_list
,
line
)
{
vec_for_each
(
hide_list
,
line
)
{
if
(
strcmp
(
processName
,
line
)
==
0
)
{
if
(
strcmp
(
processName
,
line
)
==
0
)
{
while
(
1
)
{
while
(
1
)
{
ret
=
1
;
ret
=
1
;
for
(
int
i
=
0
;
i
<
zygote_num
;
++
i
)
{
for
(
int
i
=
0
;
i
<
zygote_num
;
++
i
)
{
read_namespace
(
pid
,
buffer
,
32
);
read_namespace
(
pid
,
buffer
,
32
);
if
(
strcmp
(
buffer
,
zygote_ns
[
i
])
==
0
)
{
if
(
strcmp
(
buffer
,
zygote_ns
[
i
])
==
0
)
{
usleep
(
50
);
usleep
(
50
);
ret
=
0
;
ret
=
0
;
break
;
break
;
}
}
}
if
(
ret
)
break
;
}
}
if
(
ret
)
break
;
}
ret
=
0
;
ret
=
0
;
// Send pause signal ASAP
// Send pause signal ASAP
if
(
kill
(
pid
,
SIGSTOP
)
==
-
1
)
continue
;
if
(
kill
(
pid
,
SIGSTOP
)
==
-
1
)
continue
;
LOGI
(
"proc_monitor: %s (PID=%d ns=%s)
\n
"
,
processName
,
pid
,
buffer
);
LOGI
(
"proc_monitor: %s (PID=%d ns=%s)
\n
"
,
processName
,
pid
,
buffer
);
// Unmount start
// Unmount start
xwrite
(
sv
[
0
],
&
pid
,
sizeof
(
pid
));
xwrite
(
sv
[
0
],
&
pid
,
sizeof
(
pid
));
// Get the hide daemon return code
// Get the hide daemon return code
xxread
(
sv
[
0
],
&
ret
,
sizeof
(
ret
));
xxread
(
sv
[
0
],
&
ret
,
sizeof
(
ret
));
LOGD
(
"proc_monitor: hide daemon response code: %d
\n
"
,
ret
);
LOGD
(
"proc_monitor: hide daemon response code: %d
\n
"
,
ret
);
break
;
break
;
}
}
}
}
pthread_mutex_unlock
(
&
hide_lock
);
pthread_mutex_unlock
(
&
hide_lock
);
if
(
ret
)
{
if
(
ret
)
{
// Wait hide process to kill itself
// Wait hide process to kill itself
waitpid
(
hide_pid
,
NULL
,
0
);
waitpid
(
hide_pid
,
NULL
,
0
);
quit_pthread
(
SIGUSR1
);
quit_pthread
(
SIGUSR1
);
}
}
}
}
// Should never be here
// For some reason it went here, restart logging
quit_pthread
(
SIGUSR1
);
kill
(
log_pid
,
SIGTERM
);
waitpid
(
log_pid
,
NULL
,
0
);
close
(
log_fd
);
log_pid
=
0
;
}
}
}
jni/utils/misc.c
View file @
c282a8f3
...
@@ -67,7 +67,7 @@ int file_to_vector(const char* filename, struct vector *v) {
...
@@ -67,7 +67,7 @@ int file_to_vector(const char* filename, struct vector *v) {
size_t
len
=
0
;
size_t
len
=
0
;
ssize_t
read
;
ssize_t
read
;
FILE
*
fp
=
x
fopen
(
filename
,
"r"
);
FILE
*
fp
=
fopen
(
filename
,
"r"
);
if
(
fp
==
NULL
)
if
(
fp
==
NULL
)
return
1
;
return
1
;
...
@@ -105,16 +105,16 @@ int isNum(const char *s) {
...
@@ -105,16 +105,16 @@ int isNum(const char *s) {
/* Read a whole line from file descriptor */
/* Read a whole line from file descriptor */
ssize_t
fdgets
(
char
*
buf
,
const
size_t
size
,
int
fd
)
{
ssize_t
fdgets
(
char
*
buf
,
const
size_t
size
,
int
fd
)
{
ssize_t
read
=
0
;
ssize_t
len
=
0
;
buf
[
0
]
=
'\0'
;
buf
[
0
]
=
'\0'
;
while
(
xread
(
fd
,
buf
+
read
,
1
)
&&
read
<
size
-
1
)
{
while
(
read
(
fd
,
buf
+
len
,
1
)
>=
0
&&
len
<
size
-
1
)
{
if
(
buf
[
read
]
==
'\0'
||
buf
[
read
++
]
==
'\n'
)
{
if
(
buf
[
len
]
==
'\0'
||
buf
[
len
++
]
==
'\n'
)
{
buf
[
read
]
=
'\0'
;
buf
[
len
]
=
'\0'
;
break
;
break
;
}
}
}
}
buf
[
size
-
1
]
=
'\0'
;
buf
[
size
-
1
]
=
'\0'
;
return
read
;
return
len
;
}
}
/* Call func for each process */
/* Call func for each process */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment