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
f42d8208
Commit
f42d8208
authored
Nov 22, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Several small tweaks
parent
bc21a1fb
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
7 deletions
+12
-7
bootstages.c
jni/core/bootstages.c
+4
-0
daemon.c
jni/core/daemon.c
+3
-4
magiskinit.c
jni/core/magiskinit.c
+2
-2
magisk.h
jni/include/magisk.h
+1
-0
magiskrc.h
jni/include/magiskrc.h
+1
-0
xwrap.c
jni/utils/xwrap.c
+1
-1
No files found.
jni/core/bootstages.c
View file @
f42d8208
...
...
@@ -575,6 +575,9 @@ void post_fs(int client) {
write_int
(
client
,
0
);
close
(
client
);
// Allow magiskinit to full patch
close
(
creat
(
PATCHSTART
,
0
));
// Uninstall or core only mode
if
(
access
(
UNINSTALLER
,
F_OK
)
==
0
||
access
(
DISABLEFILE
,
F_OK
)
==
0
)
goto
unblock
;
...
...
@@ -743,6 +746,7 @@ void late_start(int client) {
// Wait till the full patch is done
while
(
access
(
PATCHDONE
,
F_OK
)
==
-
1
)
usleep
(
500
);
/* Wait 0.5ms */
unlink
(
PATCHDONE
);
// Run scripts after full patch, most reliable way to run scripts
LOGI
(
"* Running service.d scripts
\n
"
);
...
...
jni/core/daemon.c
View file @
f42d8208
...
...
@@ -120,6 +120,7 @@ void auto_start_magiskhide() {
}
void
start_daemon
()
{
setsid
();
setcon
(
"u:r:su:s0"
);
umask
(
0
);
int
fd
=
xopen
(
"/dev/null"
,
O_RDWR
|
O_CLOEXEC
);
...
...
@@ -138,11 +139,10 @@ void start_daemon() {
struct
sockaddr_un
sun
;
fd
=
setup_socket
(
&
sun
);
if
(
xbind
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
))
==
-
1
)
exit
(
1
);
xbind
(
fd
,
(
struct
sockaddr
*
)
&
sun
,
sizeof
(
sun
));
xlisten
(
fd
,
10
);
if
((
is_restart
=
access
(
UNBLOCKFILE
,
F_OK
)
==
0
))
{
if
((
is_restart
=
access
(
MAGISKTMP
,
F_OK
)
==
0
))
{
// Restart stuffs if the daemon is restarted
exec_command_sync
(
"logcat"
,
"-b"
,
"all"
,
"-c"
,
NULL
);
auto_start_magiskhide
();
...
...
@@ -189,7 +189,6 @@ int connect_daemon() {
if
(
xfork
()
==
0
)
{
LOGD
(
"client: connect fail, try launching new daemon process
\n
"
);
close
(
fd
);
xsetsid
();
start_daemon
();
}
...
...
jni/core/magiskinit.c
View file @
f42d8208
...
...
@@ -425,9 +425,9 @@ int main(int argc, char *argv[]) {
// Fork a new process for full patch
setsid
();
sepol_allow
(
"su"
,
ALL
,
ALL
,
ALL
);
while
(
access
(
SELINUX_LOAD
,
W_OK
)
==
-
1
)
{
while
(
access
(
PATCHSTART
,
W_OK
)
==
-
1
)
usleep
(
500
);
/* Wait 0.5ms */
}
unlink
(
PATCHSTART
);
dump_policydb
(
SELINUX_LOAD
);
close
(
open
(
PATCHDONE
,
O_RDONLY
|
O_CREAT
,
0
));
destroy_policydb
();
...
...
jni/include/magisk.h
View file @
f42d8208
...
...
@@ -17,6 +17,7 @@
#define LASTLOG "/cache/last_magisk.log"
#define DEBUG_LOG "/data/magisk_debug.log"
#define UNBLOCKFILE "/dev/.magisk.unblock"
#define PATCHSTART "/dev/.magisk.patch.start"
#define PATCHDONE "/dev/.magisk.patch.done"
#define DISABLEFILE "/cache/.disable_magisk"
#define UNINSTALLER "/cache/magisk_uninstaller.sh"
...
...
jni/include/magiskrc.h
View file @
f42d8208
...
...
@@ -16,6 +16,7 @@ const char magiskrc[] =
" rm /dev/.magisk.unblock
\n
"
" start magisk_pfsd
\n
"
" wait /dev/.magisk.unblock 10
\n
"
" rm /dev/.magisk.unblock
\n
"
"
\n
"
// Services
...
...
jni/utils/xwrap.c
View file @
f42d8208
...
...
@@ -159,7 +159,7 @@ int xbind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
int
xconnect
(
int
sockfd
,
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
)
{
int
ret
=
connect
(
sockfd
,
addr
,
addrlen
);
if
(
ret
==
-
1
)
{
PLOGE
(
"
bind
"
);
PLOGE
(
"
connect
"
);
}
return
ret
;
}
...
...
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