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
d08fd056
Commit
d08fd056
authored
Jun 16, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove invincible mode
parent
a6958ac1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
46 deletions
+12
-46
daemon.c
native/jni/core/daemon.c
+3
-37
magisk.c
native/jni/core/magisk.c
+5
-5
daemon.h
native/jni/include/daemon.h
+2
-2
magiskhide.c
native/jni/magiskhide/magiskhide.c
+1
-1
su
native/jni/su
+1
-1
No files found.
native/jni/core/daemon.c
View file @
d08fd056
...
@@ -95,30 +95,6 @@ static void *start_magisk_hide(void *args) {
...
@@ -95,30 +95,6 @@ static void *start_magisk_hide(void *args) {
return
NULL
;
return
NULL
;
}
}
static
void
daemon_saver
()
{
int
fd
,
val
;
struct
sockaddr_un
sun
;
// Change process name
strcpy
(
argv0
,
"magisk_saver"
);
while
(
1
)
{
fd
=
setup_socket
(
&
sun
);
while
(
connect
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
)))
usleep
(
10000
);
write_int
(
fd
,
DO_NOTHING
);
// Should hold forever unless the other side is closed
read
(
fd
,
&
val
,
sizeof
(
int
));
// If it came here, the daemon is terminated
close
(
fd
);
if
(
fork_dont_care
()
==
0
)
start_daemon
(
0
);
}
}
void
auto_start_magiskhide
()
{
void
auto_start_magiskhide
()
{
char
*
hide_prop
=
getprop2
(
MAGISKHIDE_PROP
,
1
);
char
*
hide_prop
=
getprop2
(
MAGISKHIDE_PROP
,
1
);
if
(
hide_prop
==
NULL
||
strcmp
(
hide_prop
,
"0"
)
!=
0
)
{
if
(
hide_prop
==
NULL
||
strcmp
(
hide_prop
,
"0"
)
!=
0
)
{
...
@@ -129,7 +105,7 @@ void auto_start_magiskhide() {
...
@@ -129,7 +105,7 @@ void auto_start_magiskhide() {
free
(
hide_prop
);
free
(
hide_prop
);
}
}
void
start_daemon
(
int
post_fs_data
)
{
void
start_daemon
()
{
setsid
();
setsid
();
setcon
(
"u:r:"
SEPOL_PROC_DOMAIN
":s0"
);
setcon
(
"u:r:"
SEPOL_PROC_DOMAIN
":s0"
);
int
fd
=
xopen
(
"/dev/null"
,
O_RDWR
|
O_CLOEXEC
);
int
fd
=
xopen
(
"/dev/null"
,
O_RDWR
|
O_CLOEXEC
);
...
@@ -138,9 +114,6 @@ void start_daemon(int post_fs_data) {
...
@@ -138,9 +114,6 @@ void start_daemon(int post_fs_data) {
xdup2
(
fd
,
STDERR_FILENO
);
xdup2
(
fd
,
STDERR_FILENO
);
close
(
fd
);
close
(
fd
);
if
(
post_fs_data
&&
fork_dont_care
()
==
0
)
daemon_saver
();
// Block user signals
// Block user signals
sigset_t
block_set
;
sigset_t
block_set
;
sigemptyset
(
&
block_set
);
sigemptyset
(
&
block_set
);
...
@@ -158,13 +131,6 @@ void start_daemon(int post_fs_data) {
...
@@ -158,13 +131,6 @@ void start_daemon(int post_fs_data) {
// Start the log monitor
// Start the log monitor
monitor_logs
();
monitor_logs
();
if
(
!
post_fs_data
&&
(
access
(
MAGISKTMP
,
F_OK
)
==
0
))
{
// Restart stuffs if the daemon is restarted
exec_command_sync
(
"logcat"
,
"-b"
,
"all"
,
"-c"
,
NULL
);
auto_start_magiskhide
();
start_debug_log
();
}
LOGI
(
"Magisk v"
xstr
(
MAGISK_VERSION
)
"("
xstr
(
MAGISK_VER_CODE
)
") daemon started
\n
"
);
LOGI
(
"Magisk v"
xstr
(
MAGISK_VERSION
)
"("
xstr
(
MAGISK_VER_CODE
)
") daemon started
\n
"
);
// Change process name
// Change process name
...
@@ -182,7 +148,7 @@ void start_daemon(int post_fs_data) {
...
@@ -182,7 +148,7 @@ void start_daemon(int post_fs_data) {
}
}
/* Connect the daemon, and return a socketfd */
/* Connect the daemon, and return a socketfd */
int
connect_daemon
(
int
post_fs_data
)
{
int
connect_daemon
()
{
struct
sockaddr_un
sun
;
struct
sockaddr_un
sun
;
int
fd
=
setup_socket
(
&
sun
);
int
fd
=
setup_socket
(
&
sun
);
if
(
connect
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
)))
{
if
(
connect
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
)))
{
...
@@ -196,7 +162,7 @@ int connect_daemon(int post_fs_data) {
...
@@ -196,7 +162,7 @@ int connect_daemon(int post_fs_data) {
if
(
fork_dont_care
()
==
0
)
{
if
(
fork_dont_care
()
==
0
)
{
LOGD
(
"client: connect fail, try launching new daemon process
\n
"
);
LOGD
(
"client: connect fail, try launching new daemon process
\n
"
);
close
(
fd
);
close
(
fd
);
start_daemon
(
post_fs_data
);
start_daemon
();
}
}
while
(
connect
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
)))
while
(
connect
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
)))
...
...
native/jni/core/magisk.c
View file @
d08fd056
...
@@ -71,14 +71,14 @@ int magisk_main(int argc, char *argv[]) {
...
@@ -71,14 +71,14 @@ int magisk_main(int argc, char *argv[]) {
printf
(
"%s (%d)
\n
"
,
MAGISK_VER_STR
,
MAGISK_VER_CODE
);
printf
(
"%s (%d)
\n
"
,
MAGISK_VER_STR
,
MAGISK_VER_CODE
);
return
0
;
return
0
;
}
else
if
(
strcmp
(
argv
[
1
],
"-v"
)
==
0
)
{
}
else
if
(
strcmp
(
argv
[
1
],
"-v"
)
==
0
)
{
int
fd
=
connect_daemon
(
0
);
int
fd
=
connect_daemon
();
write_int
(
fd
,
CHECK_VERSION
);
write_int
(
fd
,
CHECK_VERSION
);
char
*
v
=
read_string
(
fd
);
char
*
v
=
read_string
(
fd
);
printf
(
"%s
\n
"
,
v
);
printf
(
"%s
\n
"
,
v
);
free
(
v
);
free
(
v
);
return
0
;
return
0
;
}
else
if
(
strcmp
(
argv
[
1
],
"-V"
)
==
0
)
{
}
else
if
(
strcmp
(
argv
[
1
],
"-V"
)
==
0
)
{
int
fd
=
connect_daemon
(
0
);
int
fd
=
connect_daemon
();
write_int
(
fd
,
CHECK_VERSION_CODE
);
write_int
(
fd
,
CHECK_VERSION_CODE
);
printf
(
"%d
\n
"
,
read_int
(
fd
));
printf
(
"%d
\n
"
,
read_int
(
fd
));
return
0
;
return
0
;
...
@@ -143,18 +143,18 @@ int magisk_main(int argc, char *argv[]) {
...
@@ -143,18 +143,18 @@ int magisk_main(int argc, char *argv[]) {
clone_attr
(
argv
[
2
],
argv
[
3
]);
clone_attr
(
argv
[
2
],
argv
[
3
]);
return
0
;
return
0
;
}
else
if
(
strcmp
(
argv
[
1
],
"--daemon"
)
==
0
)
{
}
else
if
(
strcmp
(
argv
[
1
],
"--daemon"
)
==
0
)
{
int
fd
=
connect_daemon
(
0
);
int
fd
=
connect_daemon
();
close
(
fd
);
close
(
fd
);
return
0
;
return
0
;
}
else
if
(
strcmp
(
argv
[
1
],
"--startup"
)
==
0
)
{
}
else
if
(
strcmp
(
argv
[
1
],
"--startup"
)
==
0
)
{
startup
();
startup
();
return
0
;
return
0
;
}
else
if
(
strcmp
(
argv
[
1
],
"--post-fs-data"
)
==
0
)
{
}
else
if
(
strcmp
(
argv
[
1
],
"--post-fs-data"
)
==
0
)
{
int
fd
=
connect_daemon
(
1
);
int
fd
=
connect_daemon
();
write_int
(
fd
,
POST_FS_DATA
);
write_int
(
fd
,
POST_FS_DATA
);
return
read_int
(
fd
);
return
read_int
(
fd
);
}
else
if
(
strcmp
(
argv
[
1
],
"--service"
)
==
0
)
{
}
else
if
(
strcmp
(
argv
[
1
],
"--service"
)
==
0
)
{
int
fd
=
connect_daemon
(
0
);
int
fd
=
connect_daemon
();
write_int
(
fd
,
LATE_START
);
write_int
(
fd
,
LATE_START
);
return
read_int
(
fd
);
return
read_int
(
fd
);
}
}
...
...
native/jni/include/daemon.h
View file @
d08fd056
...
@@ -41,8 +41,8 @@ enum {
...
@@ -41,8 +41,8 @@ enum {
// daemon.c
// daemon.c
void
start_daemon
(
int
post_fs_data
);
void
start_daemon
();
int
connect_daemon
(
int
post_fs_data
);
int
connect_daemon
();
void
auto_start_magiskhide
();
void
auto_start_magiskhide
();
// socket.c
// socket.c
...
...
native/jni/magiskhide/magiskhide.c
View file @
d08fd056
...
@@ -135,7 +135,7 @@ int magiskhide_main(int argc, char *argv[]) {
...
@@ -135,7 +135,7 @@ int magiskhide_main(int argc, char *argv[]) {
}
else
{
}
else
{
usage
(
argv
[
0
]);
usage
(
argv
[
0
]);
}
}
int
fd
=
connect_daemon
(
0
);
int
fd
=
connect_daemon
();
write_int
(
fd
,
req
);
write_int
(
fd
,
req
);
if
(
req
==
ADD_HIDELIST
||
req
==
RM_HIDELIST
)
{
if
(
req
==
ADD_HIDELIST
||
req
==
RM_HIDELIST
)
{
write_string
(
fd
,
argv
[
2
]);
write_string
(
fd
,
argv
[
2
]);
...
...
su
@
29d57402
Subproject commit 2
c5a36a8da625079a0617c0d06f96f444c4d4bf4
Subproject commit 2
9d5740205753f911123e6672a53d8d3414e49dc
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