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
cfad7dd3
Commit
cfad7dd3
authored
Sep 01, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sanitize magiskhide targets
Fix #1785
parent
dd35224f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
3 deletions
+27
-3
hide_utils.cpp
native/jni/magiskhide/hide_utils.cpp
+22
-0
magiskhide.cpp
native/jni/magiskhide/magiskhide.cpp
+3
-2
magiskhide.h
native/jni/magiskhide/magiskhide.h
+2
-1
No files found.
native/jni/magiskhide/hide_utils.cpp
View file @
cfad7dd3
...
...
@@ -57,10 +57,32 @@ static void kill_process(const char *name, bool multi = false) {
});
}
static
bool
validate
(
const
char
*
s
)
{
bool
dot
=
false
;
for
(
char
c
;
(
c
=
*
s
);
++
s
)
{
if
((
c
>=
'A'
&&
c
<=
'Z'
)
||
(
c
>=
'a'
&&
c
<=
'z'
)
||
(
c
>=
'0'
&&
c
<=
'9'
)
||
c
==
'_'
)
{
dot
=
false
;
continue
;
}
if
(
c
==
'.'
)
{
if
(
dot
)
// No consecutive dots
return
false
;
dot
=
true
;
continue
;
}
return
false
;
}
return
true
;
}
static
int
add_list
(
const
char
*
pkg
,
const
char
*
proc
=
""
)
{
if
(
proc
[
0
]
==
'\0'
)
proc
=
pkg
;
if
(
!
validate
(
pkg
)
||
!
validate
(
proc
))
return
HIDE_INVALID_PKG
;
for
(
auto
&
hide
:
hide_set
)
if
(
hide
.
first
==
pkg
&&
hide
.
second
==
proc
)
return
HIDE_ITEM_EXIST
;
...
...
native/jni/magiskhide/magiskhide.cpp
View file @
cfad7dd3
...
...
@@ -147,8 +147,9 @@ int magiskhide_main(int argc, char *argv[]) {
case
HIDE_NO_NS
:
fprintf
(
stderr
,
"Your kernel doesn't support mount namespace
\n
"
);
break
;
/* Errors */
case
HIDE_INVALID_PKG
:
fprintf
(
stderr
,
"Invalid package / process name
\n
"
);
break
;
case
ROOT_REQUIRED
:
fprintf
(
stderr
,
"Root is required for this operation
\n
"
);
break
;
...
...
native/jni/magiskhide/magiskhide.h
View file @
cfad7dd3
...
...
@@ -58,5 +58,6 @@ enum {
HIDE_NOT_ENABLED
,
HIDE_ITEM_EXIST
,
HIDE_ITEM_NOT_EXIST
,
HIDE_NO_NS
HIDE_NO_NS
,
HIDE_INVALID_PKG
};
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