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
9c1005ff
Commit
9c1005ff
authored
Jul 18, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to Google CTS (2017.7.17)
parent
5b36b447
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
hide_utils.c
jni/magiskhide/hide_utils.c
+11
-0
magiskhide.c
jni/magiskhide/magiskhide.c
+3
-4
magiskhide.h
jni/magiskhide/magiskhide.h
+1
-0
proc_monitor.c
jni/magiskhide/proc_monitor.c
+1
-0
No files found.
jni/magiskhide/hide_utils.c
View file @
9c1005ff
...
@@ -58,6 +58,17 @@ void hide_sensitive_props() {
...
@@ -58,6 +58,17 @@ void hide_sensitive_props() {
}
}
}
}
static
void
rm_magisk_prop
(
const
char
*
name
)
{
if
(
strstr
(
name
,
"magisk"
))
{
deleteprop
(
name
,
0
);
}
}
void
clean_magisk_props
()
{
LOGD
(
"hide_utils: Cleaning magisk props
\n
"
);
getprop_all
(
rm_magisk_prop
);
}
void
relink_sbin
()
{
void
relink_sbin
()
{
struct
stat
st
;
struct
stat
st
;
if
(
stat
(
"/sbin_orig"
,
&
st
)
==
-
1
&&
errno
==
ENOENT
)
{
if
(
stat
(
"/sbin_orig"
,
&
st
)
==
-
1
&&
errno
==
ENOENT
)
{
...
...
jni/magiskhide/magiskhide.c
View file @
9c1005ff
...
@@ -55,10 +55,7 @@ void launch_magiskhide(int client) {
...
@@ -55,10 +55,7 @@ void launch_magiskhide(int client) {
hideEnabled
=
1
;
hideEnabled
=
1
;
LOGI
(
"* Starting MagiskHide
\n
"
);
LOGI
(
"* Starting MagiskHide
\n
"
);
if
(
client
>
0
)
{
deleteprop
(
MAGISKHIDE_PROP
,
1
);
if
(
setprop
(
MAGISKHIDE_PROP
,
"1"
))
goto
error
;
}
hide_sensitive_props
();
hide_sensitive_props
();
...
@@ -104,6 +101,8 @@ void stop_magiskhide(int client) {
...
@@ -104,6 +101,8 @@ void stop_magiskhide(int client) {
hideEnabled
=
0
;
hideEnabled
=
0
;
setprop
(
MAGISKHIDE_PROP
,
"0"
);
setprop
(
MAGISKHIDE_PROP
,
"0"
);
// Remove without actually removing persist props
deleteprop
(
MAGISKHIDE_PROP
,
0
);
pthread_kill
(
proc_monitor_thread
,
SIGUSR1
);
pthread_kill
(
proc_monitor_thread
,
SIGUSR1
);
write_int
(
client
,
DAEMON_SUCCESS
);
write_int
(
client
,
DAEMON_SUCCESS
);
...
...
jni/magiskhide/magiskhide.h
View file @
9c1005ff
...
@@ -13,6 +13,7 @@ void proc_monitor();
...
@@ -13,6 +13,7 @@ void proc_monitor();
void
manage_selinux
();
void
manage_selinux
();
void
hide_sensitive_props
();
void
hide_sensitive_props
();
void
relink_sbin
();
void
relink_sbin
();
void
clean_magisk_props
();
// List managements
// List managements
int
add_list
(
char
*
proc
);
int
add_list
(
char
*
proc
);
...
...
jni/magiskhide/proc_monitor.c
View file @
9c1005ff
...
@@ -91,6 +91,7 @@ static void hide_daemon(int pid) {
...
@@ -91,6 +91,7 @@ static void hide_daemon(int pid) {
manage_selinux
();
manage_selinux
();
relink_sbin
();
relink_sbin
();
clean_magisk_props
();
if
(
switch_mnt_ns
(
pid
))
if
(
switch_mnt_ns
(
pid
))
return
;
return
;
...
...
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