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
1e714af3
Commit
1e714af3
authored
Apr 19, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support MagiskHide when /sbin does not exist
parent
4c959cd9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
16 deletions
+20
-16
hide_policy.cpp
native/jni/magiskhide/hide_policy.cpp
+4
-3
hide_utils.cpp
native/jni/magiskhide/hide_utils.cpp
+16
-8
magiskhide.hpp
native/jni/magiskhide/magiskhide.hpp
+0
-5
No files found.
native/jni/magiskhide/hide_policy.cpp
View file @
1e714af3
...
...
@@ -87,13 +87,14 @@ void hide_unmount(int pid) {
vector
<
string
>
targets
;
// Unmount dummy skeletons and /sbin links
targets
.
push_back
(
MAGISKTMP
);
parse_mnt
(
"/proc/self/mounts"
,
[
&
](
mntent
*
mentry
)
{
if
(
TMPFS_MNT
(
system
)
||
TMPFS_MNT
(
vendor
)
||
TMPFS_MNT
(
sbin
)
||
TMPFS_MNT
(
produc
t
))
if
(
TMPFS_MNT
(
system
)
||
TMPFS_MNT
(
vendor
)
||
TMPFS_MNT
(
product
)
||
TMPFS_MNT
(
system_ex
t
))
targets
.
emplace_back
(
mentry
->
mnt_dir
);
return
true
;
});
for
(
auto
&
s
:
targets
)
for
(
auto
&
s
:
reversed
(
targets
)
)
lazy_unmount
(
s
.
data
());
targets
.
clear
();
...
...
@@ -104,7 +105,7 @@ void hide_unmount(int pid) {
return
true
;
});
for
(
auto
&
s
:
targets
)
for
(
auto
&
s
:
reversed
(
targets
)
)
lazy_unmount
(
s
.
data
());
}
native/jni/magiskhide/hide_utils.cpp
View file @
1e714af3
...
...
@@ -121,15 +121,13 @@ static int rm_list(const char *pkg, const char *proc = "") {
// Critical region
mutex_guard
lock
(
monitor_lock
);
bool
remove
=
false
;
auto
next
=
hide_set
.
begin
();
decltype
(
next
)
cur
;
while
(
next
!=
hide_set
.
end
())
{
cur
=
next
;
++
next
;
if
(
cur
->
first
==
pkg
&&
(
proc
[
0
]
==
'\0'
||
cur
->
second
==
proc
))
{
for
(
auto
it
=
hide_set
.
begin
();
it
!=
hide_set
.
end
();)
{
if
(
it
->
first
==
pkg
&&
(
proc
[
0
]
==
'\0'
||
it
->
second
==
proc
))
{
remove
=
true
;
LOGI
(
"hide_list rm: [%s]
\n
"
,
cur
->
second
.
data
());
hide_set
.
erase
(
cur
);
LOGI
(
"hide_list rm: [%s]
\n
"
,
it
->
second
.
data
());
it
=
hide_set
.
erase
(
it
);
}
else
{
++
it
;
}
}
if
(
!
remove
)
...
...
@@ -166,6 +164,11 @@ static void init_list(const char *pkg, const char *proc) {
#define LEGACY_LIST MODULEROOT "/.core/hidelist"
#define SAFETYNET_COMPONENT "com.google.android.gms/.droidguard.DroidGuardService"
#define SAFETYNET_PROCESS "com.google.android.gms.unstable"
#define SAFETYNET_PKG "com.google.android.gms"
#define MICROG_SAFETYNET "org.microg.gms.droidguard"
bool
init_list
()
{
LOGD
(
"hide_list: initialize
\n
"
);
...
...
@@ -196,6 +199,11 @@ bool init_list() {
init_list
(
SAFETYNET_PKG
,
SAFETYNET_PROCESS
);
init_list
(
MICROG_SAFETYNET
,
SAFETYNET_PROCESS
);
// We also need to hide the default GMS process if MAGISKTMP != /sbin
// The snet process communicates with the main process and get additional info
if
(
MAGISKTMP
!=
"/sbin"
)
init_list
(
SAFETYNET_PKG
,
SAFETYNET_PKG
);
update_uid_map
();
return
true
;
}
...
...
native/jni/magiskhide/magiskhide.hpp
View file @
1e714af3
...
...
@@ -15,11 +15,6 @@
#define SIGTERMTHRD SIGUSR1
#define SIGZYGOTE SIGUSR2
#define SAFETYNET_COMPONENT "com.google.android.gms/.droidguard.DroidGuardService"
#define SAFETYNET_PROCESS "com.google.android.gms.unstable"
#define SAFETYNET_PKG "com.google.android.gms"
#define MICROG_SAFETYNET "org.microg.gms.droidguard"
// CLI entries
void
launch_magiskhide
(
int
client
);
int
stop_magiskhide
();
...
...
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