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
bc592c1d
Commit
bc592c1d
authored
Nov 23, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bootloops on some devices
parent
968bd8be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
17 deletions
+18
-17
magiskinit.c
jni/core/magiskinit.c
+18
-17
No files found.
jni/core/magiskinit.c
View file @
bc592c1d
...
@@ -63,18 +63,19 @@ struct device {
...
@@ -63,18 +63,19 @@ struct device {
extern
policydb_t
*
policydb
;
extern
policydb_t
*
policydb
;
static
void
parse_cmdline
(
struct
cmdline
*
cmd
)
{
static
void
parse_cmdline
(
struct
cmdline
*
cmd
)
{
// cleanup
cmd
->
skip_initramfs
=
0
;
cmd
->
slot
[
0
]
=
'\0'
;
char
*
tok
;
char
*
tok
;
char
buffer
[
4096
];
char
cmdline
[
4096
];
mkdir
(
"/proc"
,
0555
);
mkdir
(
"/proc"
,
0555
);
mount
(
"proc"
,
"/proc"
,
"proc"
,
0
,
NULL
);
mount
(
"proc"
,
"/proc"
,
"proc"
,
0
,
NULL
);
int
fd
=
open
(
"/proc/cmdline"
,
O_RDONLY
|
O_CLOEXEC
);
int
fd
=
open
(
"/proc/cmdline"
,
O_RDONLY
|
O_CLOEXEC
);
ssize_t
size
=
read
(
fd
,
buffer
,
sizeof
(
buffer
));
cmdline
[
read
(
fd
,
cmdline
,
sizeof
(
cmdline
))]
=
'\0'
;
buffer
[
size
]
=
'\0'
;
close
(
fd
);
close
(
fd
);
umount
(
"/proc"
);
umount
(
"/proc"
);
tok
=
strtok
(
buffer
,
" "
);
tok
=
strtok
(
cmdline
,
" "
);
cmd
->
skip_initramfs
=
0
;
cmd
->
slot
[
0
]
=
'\0'
;
while
(
tok
!=
NULL
)
{
while
(
tok
!=
NULL
)
{
if
(
strncmp
(
tok
,
"androidboot.slot_suffix"
,
23
)
==
0
)
{
if
(
strncmp
(
tok
,
"androidboot.slot_suffix"
,
23
)
==
0
)
{
sscanf
(
tok
,
"androidboot.slot_suffix=%s"
,
cmd
->
slot
);
sscanf
(
tok
,
"androidboot.slot_suffix=%s"
,
cmd
->
slot
);
...
@@ -340,14 +341,14 @@ static int dump_magiskrc(const char *path, mode_t mode) {
...
@@ -340,14 +341,14 @@ static int dump_magiskrc(const char *path, mode_t mode) {
}
}
int
main
(
int
argc
,
char
*
argv
[])
{
int
main
(
int
argc
,
char
*
argv
[])
{
umask
(
0
);
if
(
strcmp
(
basename
(
argv
[
0
]),
"magiskpolicy"
)
==
0
||
strcmp
(
basename
(
argv
[
0
]),
"supolicy"
)
==
0
)
if
(
strcmp
(
basename
(
argv
[
0
]),
"magiskpolicy"
)
==
0
||
strcmp
(
basename
(
argv
[
0
]),
"supolicy"
)
==
0
)
return
magiskpolicy_main
(
argc
,
argv
);
return
magiskpolicy_main
(
argc
,
argv
);
if
(
argc
>
1
&&
(
strcmp
(
argv
[
1
],
"magiskpolicy"
)
==
0
||
strcmp
(
argv
[
1
],
"supolicy"
)
==
0
))
if
(
argc
>
1
&&
(
strcmp
(
argv
[
1
],
"magiskpolicy"
)
==
0
||
strcmp
(
argv
[
1
],
"supolicy"
)
==
0
))
return
magiskpolicy_main
(
argc
-
1
,
argv
+
1
);
return
magiskpolicy_main
(
argc
-
1
,
argv
+
1
);
umask
(
0
);
if
(
argc
>
1
&&
strcmp
(
argv
[
1
],
"-x"
)
==
0
)
{
if
(
argc
>
1
)
{
if
(
strcmp
(
argv
[
2
],
"magisk"
)
==
0
)
if
(
strcmp
(
argv
[
2
],
"magisk"
)
==
0
)
return
dump_magisk
(
argv
[
3
],
0755
);
return
dump_magisk
(
argv
[
3
],
0755
);
else
if
(
strcmp
(
argv
[
2
],
"magiskrc"
)
==
0
)
else
if
(
strcmp
(
argv
[
2
],
"magiskrc"
)
==
0
)
...
@@ -412,15 +413,16 @@ int main(int argc, char *argv[]) {
...
@@ -412,15 +413,16 @@ int main(int argc, char *argv[]) {
int
overlay
=
open
(
"/overlay"
,
O_RDONLY
|
O_CLOEXEC
);
int
overlay
=
open
(
"/overlay"
,
O_RDONLY
|
O_CLOEXEC
);
mv_dir
(
overlay
,
root
);
mv_dir
(
overlay
,
root
);
patch_ramdisk
();
patch_sepolicy
();
// Clean up
// Clean up
rmdir
(
"/overlay"
);
rmdir
(
"/overlay"
);
umount
(
"/vendor"
);
close
(
overlay
);
close
(
overlay
);
close
(
root
);
close
(
root
);
patch_ramdisk
();
patch_sepolicy
();
umount
(
"/vendor"
);
if
(
fork
()
==
0
)
{
if
(
fork
()
==
0
)
{
// Fork a new process for full patch
// Fork a new process for full patch
setsid
();
setsid
();
...
@@ -431,10 +433,9 @@ int main(int argc, char *argv[]) {
...
@@ -431,10 +433,9 @@ int main(int argc, char *argv[]) {
dump_policydb
(
SELINUX_LOAD
);
dump_policydb
(
SELINUX_LOAD
);
close
(
open
(
PATCHDONE
,
O_RDONLY
|
O_CREAT
,
0
));
close
(
open
(
PATCHDONE
,
O_RDONLY
|
O_CREAT
,
0
));
destroy_policydb
();
destroy_policydb
();
}
else
{
return
0
;
// Finally, give control back!
execv
(
"/init"
,
argv
);
}
}
return
0
;
// Finally, give control back!
execv
(
"/init"
,
argv
);
}
}
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