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
97b72a59
Commit
97b72a59
authored
Jul 06, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert to old SElinux rules on pre 8.0 devices
Fix #2910
parent
7922f652
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
71 deletions
+97
-71
daemon.cpp
native/jni/core/daemon.cpp
+14
-14
restorecon.cpp
native/jni/core/restorecon.cpp
+2
-1
rules.cpp
native/jni/magiskpolicy/rules.cpp
+80
-52
emulator.sh
scripts/emulator.sh
+1
-4
No files found.
native/jni/core/daemon.cpp
View file @
97b72a59
...
...
@@ -156,6 +156,8 @@ static void daemon_entry(int ppid) {
setsid
();
setcon
(
"u:r:"
SEPOL_PROC_DOMAIN
":s0"
);
LOGI
(
NAME_WITH_VER
(
Magisk
)
" daemon started
\n
"
);
// Make sure ppid is not in acct
char
src
[
64
],
dest
[
64
];
sprintf
(
src
,
"/acct/uid_0/pid_%d"
,
ppid
);
...
...
@@ -167,20 +169,6 @@ static void daemon_entry(int ppid) {
MAGISKTMP
=
dirname
(
src
);
xstat
(
"/proc/self/exe"
,
&
self_st
);
restore_tmpcon
();
// SAR cleanups
auto
mount_list
=
MAGISKTMP
+
"/"
ROOTMNT
;
if
(
access
(
mount_list
.
data
(),
F_OK
)
==
0
)
{
file_readline
(
true
,
mount_list
.
data
(),
[](
string_view
line
)
->
bool
{
umount2
(
line
.
data
(),
MNT_DETACH
);
return
true
;
});
}
unlink
(
"/dev/.se"
);
LOGI
(
NAME_WITH_VER
(
Magisk
)
" daemon started
\n
"
);
// Get API level
parse_prop_file
(
"/system/build.prop"
,
[](
auto
key
,
auto
val
)
->
bool
{
if
(
key
==
"ro.build.version.sdk"
)
{
...
...
@@ -198,6 +186,18 @@ static void daemon_entry(int ppid) {
}
LOGI
(
"* Device API level: %d
\n
"
,
SDK_INT
);
restore_tmpcon
();
// SAR cleanups
auto
mount_list
=
MAGISKTMP
+
"/"
ROOTMNT
;
if
(
access
(
mount_list
.
data
(),
F_OK
)
==
0
)
{
file_readline
(
true
,
mount_list
.
data
(),
[](
string_view
line
)
->
bool
{
umount2
(
line
.
data
(),
MNT_DETACH
);
return
true
;
});
}
unlink
(
"/dev/.se"
);
// Load config status
auto
config
=
MAGISKTMP
+
"/"
INTLROOT
"/config"
;
parse_prop_file
(
config
.
data
(),
[](
auto
key
,
auto
val
)
->
bool
{
...
...
native/jni/core/restorecon.cpp
View file @
97b72a59
#include <string_view>
#include <magisk.hpp>
#include <daemon.hpp>
#include <selinux.hpp>
#include <utils.hpp>
...
...
@@ -87,7 +88,7 @@ void restore_tmpcon() {
int
dfd
=
dirfd
(
dir
.
get
());
for
(
dirent
*
entry
;
(
entry
=
xreaddir
(
dir
.
get
()));)
{
if
(
entry
->
d_name
==
"magisk"
sv
)
if
(
SDK_INT
>=
26
&&
entry
->
d_name
==
"magisk"
sv
)
setfilecon_at
(
dfd
,
entry
->
d_name
,
EXEC_CON
);
else
setfilecon_at
(
dfd
,
entry
->
d_name
,
SYSTEM_CON
);
...
...
native/jni/magiskpolicy/rules.cpp
View file @
97b72a59
...
...
@@ -8,17 +8,18 @@ void sepolicy::magisk_rules() {
auto
bak
=
log_cb
.
w
;
log_cb
.
w
=
nop_log
;
// This indicates API 26+
bool
new_rules
=
exists
(
"untrusted_app_25"
);
// Prevent anything to change sepolicy except ourselves
deny
(
ALL
,
"kernel"
,
"security"
,
"load_policy"
);
type
(
SEPOL_PROC_DOMAIN
,
"domain"
);
type
(
SEPOL_CLIENT_DOMAIN
,
"domain"
);
type
(
SEPOL_FILE_TYPE
,
"file_type"
);
type
(
SEPOL_EXEC_TYPE
,
"file_type"
);
permissive
(
SEPOL_PROC_DOMAIN
);
/* Just in case something is missing */
typeattribute
(
SEPOL_PROC_DOMAIN
,
"mlstrustedsubject"
);
typeattribute
(
SEPOL_PROC_DOMAIN
,
"netdomain"
);
typeattribute
(
SEPOL_PROC_DOMAIN
,
"bluetoothdomain"
);
type
(
SEPOL_FILE_TYPE
,
"file_type"
);
typeattribute
(
SEPOL_FILE_TYPE
,
"mlstrustedobject"
);
// Make our root domain unconstrained
...
...
@@ -33,58 +34,85 @@ void sepolicy::magisk_rules() {
allow
(
ALL
,
SEPOL_FILE_TYPE
,
"fifo_file"
,
ALL
);
allow
(
ALL
,
SEPOL_FILE_TYPE
,
"chr_file"
,
ALL
);
// Basic su client needs
allow
(
SEPOL_CLIENT_DOMAIN
,
ALL
,
"fd"
,
"use"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_CLIENT_DOMAIN
,
ALL
,
ALL
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_EXEC_TYPE
,
"file"
,
ALL
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
"connectto"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
"getopt"
);
// Allow su client to manipulate pts
const
char
*
pts
[]
{
"devpts"
,
"untrusted_app_devpts"
,
"untrusted_app_25_devpts"
,
"untrusted_app_all_devpts"
};
for
(
auto
type
:
pts
)
{
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"read"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"write"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"getattr"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"ioctl"
);
if
(
db
->
policyvers
>=
POLICYDB_VERSION_XPERMS_IOCTL
)
if
(
new_rules
)
{
type
(
SEPOL_CLIENT_DOMAIN
,
"domain"
);
type
(
SEPOL_EXEC_TYPE
,
"file_type"
);
// Basic su client needs
allow
(
SEPOL_CLIENT_DOMAIN
,
ALL
,
"fd"
,
"use"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_CLIENT_DOMAIN
,
ALL
,
ALL
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_EXEC_TYPE
,
"file"
,
ALL
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
"connectto"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
"getopt"
);
// Allow su client termios ioctl
const
char
*
pts
[]
{
"devpts"
,
"untrusted_app_devpts"
,
"untrusted_app_25_devpts"
,
"untrusted_app_all_devpts"
};
for
(
auto
type
:
pts
)
{
if
(
!
exists
(
type
))
continue
;
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"read"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"write"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"getattr"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"ioctl"
);
allowxperm
(
SEPOL_CLIENT_DOMAIN
,
type
,
"chr_file"
,
"0x5400-0x54FF"
);
}
// Allow these processes to access MagiskSU
const
char
*
clients
[]
{
"init"
,
"shell"
,
"system_app"
,
"priv_app"
,
"platform_app"
,
"untrusted_app"
,
"untrusted_app_25"
,
"untrusted_app_27"
,
"untrusted_app_29"
,
"update_engine"
};
for
(
auto
type
:
clients
)
{
if
(
!
exists
(
type
))
continue
;
// exec magisk
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"read"
);
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"open"
);
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"getattr"
);
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"execute"
);
// Auto transit to client domain
type_transition
(
type
,
SEPOL_EXEC_TYPE
,
"process"
,
SEPOL_CLIENT_DOMAIN
);
allow
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"transition"
);
dontaudit
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"siginh"
);
dontaudit
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"rlimitinh"
);
dontaudit
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"noatsecure"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"process"
,
"sigchld"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"fifo_file"
,
"read"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"fifo_file"
,
"write"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"fifo_file"
,
"ioctl"
);
}
// Allow system_server to manage magisk_client
allow
(
"system_server"
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"getpgid"
);
allow
(
"system_server"
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"sigkill"
);
// Don't allow pesky processes to monitor audit deny logs when poking magisk daemon sockets
dontaudit
(
ALL
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
ALL
);
}
else
{
// Fallback to poking holes in sandbox as Android 4.3 to 7.1 set PR_SET_NO_NEW_PRIVS
// Allow these processes to access MagiskSU
const
char
*
clients
[]
{
"init"
,
"shell"
,
"system_app"
,
"priv_app"
,
"platform_app"
,
"untrusted_app"
};
for
(
auto
type
:
clients
)
{
if
(
!
exists
(
type
))
continue
;
allow
(
type
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
"connectto"
);
allow
(
type
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
"getopt"
);
// Allow termios ioctl
const
char
*
pts
[]
{
"devpts"
,
"untrusted_app_devpts"
};
for
(
auto
pts_type
:
pts
)
{
allow
(
type
,
pts_type
,
"chr_file"
,
"ioctl"
);
if
(
db
->
policyvers
>=
POLICYDB_VERSION_XPERMS_IOCTL
)
allowxperm
(
type
,
pts_type
,
"chr_file"
,
"0x5400-0x54FF"
);
}
}
}
// Allow these processes to access MagiskSU
const
char
*
clients
[]
{
"init"
,
"shell"
,
"system_app"
,
"priv_app"
,
"platform_app"
,
"untrusted_app"
,
"untrusted_app_25"
,
"untrusted_app_27"
,
"untrusted_app_29"
,
"update_engine"
};
for
(
auto
type
:
clients
)
{
if
(
!
exists
(
type
))
continue
;
// exec magisk
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"read"
);
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"open"
);
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"getattr"
);
allow
(
type
,
SEPOL_EXEC_TYPE
,
"file"
,
"execute"
);
// Auto transit to client domain
type_transition
(
type
,
SEPOL_EXEC_TYPE
,
"process"
,
SEPOL_CLIENT_DOMAIN
);
allow
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"transition"
);
dontaudit
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"siginh"
);
dontaudit
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"rlimitinh"
);
dontaudit
(
type
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"noatsecure"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"process"
,
"sigchld"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"fifo_file"
,
"read"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"fifo_file"
,
"write"
);
allow
(
SEPOL_CLIENT_DOMAIN
,
type
,
"fifo_file"
,
"ioctl"
);
}
// Allow system_server to manage magisk_client
allow
(
"system_server"
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"getpgid"
);
allow
(
"system_server"
,
SEPOL_CLIENT_DOMAIN
,
"process"
,
"sigkill"
);
// Don't allow pesky processes to monitor audit deny logs when poking magisk daemon sockets
dontaudit
(
ALL
,
SEPOL_PROC_DOMAIN
,
"unix_stream_socket"
,
ALL
);
// Let everyone access tmpfs files (for SAR sbin overlay)
allow
(
ALL
,
"tmpfs"
,
"file"
,
ALL
);
...
...
scripts/emulator.sh
View file @
97b72a59
...
...
@@ -57,7 +57,7 @@ pgrep magiskd >/dev/null && pkill -9 magiskd
[
-e
/sys/fs/selinux
]
&&
SELINUX
=
true
||
SELINUX
=
false
if
$SELINUX
;
then
ln
-sf
./magiskinit magiskpolicy
./magiskpolicy
--live
--magisk
'allow magisk * * *'
./magiskpolicy
--live
--magisk
fi
# Setup sbin overlay
...
...
@@ -94,9 +94,6 @@ chmod 755 /sbin/magisk
ln
-s
./magisk /sbin/su
ln
-s
./magisk /sbin/resetprop
ln
-s
./magisk /sbin/magiskhide
mkdir
-p
/sbin/.magisk/busybox
cp
-af
./busybox /sbin/.magisk/busybox/busybox
/sbin/.magisk/busybox/busybox
--install
-s
/sbin/.magisk/busybox
mkdir
-p
/data/adb/modules 2>/dev/null
mkdir
/data/adb/post-fs-data.d 2>/dev/null
mkdir
/data/adb/services.d 2>/dev/null
...
...
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