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
18d0fd9d
Commit
18d0fd9d
authored
Jul 16, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MagiskInit optimizations
parent
c2e673f9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
73 deletions
+46
-73
magiskinit.c
native/jni/core/magiskinit.c
+46
-43
utils.h
native/jni/include/utils.h
+0
-1
pattern.c
native/jni/utils/pattern.c
+0
-29
No files found.
native/jni/core/magiskinit.c
View file @
18d0fd9d
...
@@ -147,26 +147,6 @@ static int setup_block(struct device *dev, const char *partname) {
...
@@ -147,26 +147,6 @@ static int setup_block(struct device *dev, const char *partname) {
return
0
;
return
0
;
}
}
static
void
patch_ramdisk
()
{
void
*
addr
;
size_t
size
;
mmap_rw
(
"/init"
,
&
addr
,
&
size
);
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
if
(
memcmp
(
addr
+
i
,
SPLIT_PLAT_CIL
,
sizeof
(
SPLIT_PLAT_CIL
)
-
1
)
==
0
)
{
memcpy
(
addr
+
i
+
sizeof
(
SPLIT_PLAT_CIL
)
-
4
,
"xxx"
,
3
);
break
;
}
}
munmap
(
addr
,
size
);
full_read
(
"/init.rc"
,
&
addr
,
&
size
);
patch_init_rc
(
&
addr
,
&
size
);
int
fd
=
creat
(
"/init.rc"
,
0750
);
write
(
fd
,
addr
,
size
);
close
(
fd
);
free
(
addr
);
}
static
int
strend
(
const
char
*
s1
,
const
char
*
s2
)
{
static
int
strend
(
const
char
*
s1
,
const
char
*
s2
)
{
size_t
l1
=
strlen
(
s1
);
size_t
l1
=
strlen
(
s1
);
size_t
l2
=
strlen
(
s2
);
size_t
l2
=
strlen
(
s2
);
...
@@ -306,7 +286,7 @@ static int unxz(const void *buf, size_t size, int fd) {
...
@@ -306,7 +286,7 @@ static int unxz(const void *buf, size_t size, int fd) {
strm
.
next_out
=
out
;
strm
.
next_out
=
out
;
strm
.
avail_out
=
BUFSIZE
;
strm
.
avail_out
=
BUFSIZE
;
ret
=
lzma_code
(
&
strm
,
LZMA_RUN
);
ret
=
lzma_code
(
&
strm
,
LZMA_RUN
);
write
(
fd
,
out
,
BUFSIZE
-
strm
.
avail_out
);
x
write
(
fd
,
out
,
BUFSIZE
-
strm
.
avail_out
);
}
while
(
strm
.
avail_out
==
0
&&
ret
==
LZMA_OK
);
}
while
(
strm
.
avail_out
==
0
&&
ret
==
LZMA_OK
);
free
(
out
);
free
(
out
);
...
@@ -335,7 +315,7 @@ static int dump_manager(const char *path, mode_t mode) {
...
@@ -335,7 +315,7 @@ static int dump_manager(const char *path, mode_t mode) {
static
int
dump_magiskrc
(
const
char
*
path
,
mode_t
mode
)
{
static
int
dump_magiskrc
(
const
char
*
path
,
mode_t
mode
)
{
int
fd
=
creat
(
path
,
mode
);
int
fd
=
creat
(
path
,
mode
);
write
(
fd
,
magiskrc
,
sizeof
(
magiskrc
));
x
write
(
fd
,
magiskrc
,
sizeof
(
magiskrc
));
close
(
fd
);
close
(
fd
);
return
0
;
return
0
;
}
}
...
@@ -388,15 +368,11 @@ int main(int argc, char *argv[]) {
...
@@ -388,15 +368,11 @@ int main(int argc, char *argv[]) {
close
(
null
);
close
(
null
);
// Backup self
// Backup self
link
(
"/init"
,
"/init.bak"
);
rename
(
"/init"
,
"/init.bak"
);
struct
cmdline
cmd
;
struct
cmdline
cmd
;
parse_cmdline
(
&
cmd
);
parse_cmdline
(
&
cmd
);
/* ***********
* Initialize
* ***********/
int
root
=
open
(
"/"
,
O_RDONLY
|
O_CLOEXEC
);
int
root
=
open
(
"/"
,
O_RDONLY
|
O_CLOEXEC
);
if
(
cmd
.
skip_initramfs
)
{
if
(
cmd
.
skip_initramfs
)
{
...
@@ -422,7 +398,6 @@ int main(int argc, char *argv[]) {
...
@@ -422,7 +398,6 @@ int main(int argc, char *argv[]) {
cpio_vec_destroy
(
&
v
);
cpio_vec_destroy
(
&
v
);
}
else
{
}
else
{
// Revert original init binary
// Revert original init binary
unlink
(
"/init"
);
link
(
"/.backup/init"
,
"/init"
);
link
(
"/.backup/init"
,
"/init"
);
}
}
...
@@ -430,8 +405,8 @@ int main(int argc, char *argv[]) {
...
@@ -430,8 +405,8 @@ int main(int argc, char *argv[]) {
* Early Mount
* Early Mount
* ************/
* ************/
int
m
ounted
_system
=
0
;
int
m
nt
_system
=
0
;
int
m
ounted
_vendor
=
0
;
int
m
nt
_vendor
=
0
;
// If skip_initramfs or using split policies, we need early mount
// If skip_initramfs or using split policies, we need early mount
if
(
cmd
.
skip_initramfs
||
access
(
"/sepolicy"
,
R_OK
)
!=
0
)
{
if
(
cmd
.
skip_initramfs
||
access
(
"/sepolicy"
,
R_OK
)
!=
0
)
{
...
@@ -459,34 +434,63 @@ int main(int argc, char *argv[]) {
...
@@ -459,34 +434,63 @@ int main(int argc, char *argv[]) {
xmount
(
"/system_root/system"
,
"/system"
,
NULL
,
MS_BIND
,
NULL
);
xmount
(
"/system_root/system"
,
"/system"
,
NULL
,
MS_BIND
,
NULL
);
}
else
{
}
else
{
xmount
(
dev
.
path
,
"/system"
,
"ext4"
,
MS_RDONLY
,
NULL
);
xmount
(
dev
.
path
,
"/system"
,
"ext4"
,
MS_RDONLY
,
NULL
);
m
ounted
_system
=
1
;
m
nt
_system
=
1
;
}
}
// Mount vendor
// Mount vendor
snprintf
(
partname
,
sizeof
(
partname
),
"vendor%s"
,
cmd
.
slot
);
snprintf
(
partname
,
sizeof
(
partname
),
"vendor%s"
,
cmd
.
slot
);
if
(
setup_block
(
&
dev
,
partname
)
==
0
)
{
if
(
setup_block
(
&
dev
,
partname
)
==
0
)
{
xmount
(
dev
.
path
,
"/vendor"
,
"ext4"
,
MS_RDONLY
,
NULL
);
xmount
(
dev
.
path
,
"/vendor"
,
"ext4"
,
MS_RDONLY
,
NULL
);
m
ounted
_vendor
=
1
;
m
nt
_vendor
=
1
;
}
}
}
/* *************
// Force init to load monolithic sepolicy
* Patch rootfs
void
*
addr
;
* *************/
size_t
size
;
mmap_rw
(
"/init"
,
&
addr
,
&
size
);
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
if
(
memcmp
(
addr
+
i
,
SPLIT_PLAT_CIL
,
sizeof
(
SPLIT_PLAT_CIL
)
-
1
)
==
0
)
{
memcpy
(
addr
+
i
+
sizeof
(
SPLIT_PLAT_CIL
)
-
4
,
"xxx"
,
3
);
break
;
}
}
munmap
(
addr
,
size
);
}
// Only patch rootfs if not intended to run in recovery
// Only patch rootfs if not intended to run in recovery
if
(
access
(
"/etc/recovery.fstab"
,
F_OK
)
!=
0
)
{
if
(
access
(
"/etc/recovery.fstab"
,
F_OK
)
!=
0
)
{
int
fd
;
// Handle ramdisk overlays
// Handle ramdisk overlays
fd
=
open
(
"/overlay"
,
O_RDONLY
|
O_CLOEXEC
);
int
fd
=
open
(
"/overlay"
,
O_RDONLY
|
O_CLOEXEC
);
if
(
fd
>=
0
)
{
if
(
fd
>=
0
)
{
mv_dir
(
fd
,
root
);
mv_dir
(
fd
,
root
);
close
(
fd
);
close
(
fd
);
rmdir
(
"/overlay"
);
rmdir
(
"/overlay"
);
}
}
patch_ramdisk
();
// Patch init.rc to load magisk scripts
int
injected
=
0
;
char
tok
[
4096
];
FILE
*
fp
=
xfopen
(
"/init.rc"
,
"r"
);
fd
=
creat
(
"/init.rc.new"
,
0750
);
while
(
fgets
(
tok
,
sizeof
(
tok
),
fp
))
{
if
(
!
injected
&&
strncmp
(
tok
,
"import"
,
6
)
==
0
)
{
if
(
strstr
(
tok
,
"init.magisk.rc"
))
{
injected
=
1
;
}
else
{
xwrite
(
fd
,
"import /init.magisk.rc
\n
"
,
23
);
injected
=
1
;
}
}
else
if
(
strstr
(
tok
,
"selinux.reload_policy"
))
{
// Do not allow sepolicy patch
continue
;
}
xwrite
(
fd
,
tok
,
strlen
(
tok
));
}
fclose
(
fp
);
close
(
fd
);
rename
(
"/init.rc.new"
,
"/init.rc"
);
// Patch sepolicy
patch_sepolicy
();
patch_sepolicy
();
// Dump binaries
// Dump binaries
...
@@ -500,11 +504,10 @@ int main(int argc, char *argv[]) {
...
@@ -500,11 +504,10 @@ int main(int argc, char *argv[]) {
close
(
root
);
close
(
root
);
umount
(
"/proc"
);
umount
(
"/proc"
);
umount
(
"/sys"
);
umount
(
"/sys"
);
if
(
m
ounted
_system
)
if
(
m
nt
_system
)
umount
(
"/system"
);
umount
(
"/system"
);
if
(
m
ounted
_vendor
)
if
(
m
nt
_vendor
)
umount
(
"/vendor"
);
umount
(
"/vendor"
);
// Finally, give control back!
execv
(
"/init"
,
argv
);
execv
(
"/init"
,
argv
);
}
}
native/jni/include/utils.h
View file @
18d0fd9d
...
@@ -157,7 +157,6 @@ int trim_img(const char *img, const char *mount, char *loop);
...
@@ -157,7 +157,6 @@ int trim_img(const char *img, const char *mount, char *loop);
// pattern.c
// pattern.c
void
patch_init_rc
(
void
**
buf
,
size_t
*
size
);
int
patch_verity
(
void
**
buf
,
uint32_t
*
size
,
int
patch
);
int
patch_verity
(
void
**
buf
,
uint32_t
*
size
,
int
patch
);
void
patch_encryption
(
void
**
buf
,
uint32_t
*
size
);
void
patch_encryption
(
void
**
buf
,
uint32_t
*
size
);
...
...
native/jni/utils/pattern.c
View file @
18d0fd9d
...
@@ -29,35 +29,6 @@ static int check_encryption_pattern(const char *s) {
...
@@ -29,35 +29,6 @@ static int check_encryption_pattern(const char *s) {
return
-
1
;
return
-
1
;
}
}
void
patch_init_rc
(
void
**
buf
,
size_t
*
size
)
{
int
injected
=
0
;
char
*
new_data
=
malloc
(
*
size
+
23
);
char
*
old_data
=
*
buf
;
size_t
pos
=
0
;
for
(
char
*
tok
=
strsep
(
&
old_data
,
"
\n
"
);
tok
;
tok
=
strsep
(
&
old_data
,
"
\n
"
))
{
if
(
!
injected
&&
strncmp
(
tok
,
"import"
,
6
)
==
0
)
{
if
(
strstr
(
tok
,
"init.magisk.rc"
))
{
injected
=
1
;
}
else
{
strcpy
(
new_data
+
pos
,
"import /init.magisk.rc
\n
"
);
pos
+=
23
;
injected
=
1
;
}
}
else
if
(
strstr
(
tok
,
"selinux.reload_policy"
))
{
continue
;
}
// Copy the line
strcpy
(
new_data
+
pos
,
tok
);
pos
+=
strlen
(
tok
);
new_data
[
pos
++
]
=
'\n'
;
}
free
(
*
buf
);
*
size
=
pos
;
*
buf
=
new_data
;
}
int
patch_verity
(
void
**
buf
,
uint32_t
*
size
,
int
patch
)
{
int
patch_verity
(
void
**
buf
,
uint32_t
*
size
,
int
patch
)
{
int
skip
,
src_size
=
*
size
,
found
=
0
;
int
skip
,
src_size
=
*
size
,
found
=
0
;
char
*
src
=
*
buf
,
*
patched
=
patch
?
xcalloc
(
src_size
,
1
)
:
NULL
;
char
*
src
=
*
buf
,
*
patched
=
patch
?
xcalloc
(
src_size
,
1
)
:
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