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
a94fa811
Commit
a94fa811
authored
Feb 13, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support non skip_initramfs device with slot suffix
parent
6119c247
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
105 deletions
+70
-105
magiskinit.c
native/jni/core/magiskinit.c
+69
-104
magisk_uninstaller.sh
scripts/magisk_uninstaller.sh
+1
-1
No files found.
native/jni/core/magiskinit.c
View file @
a94fa811
...
@@ -55,12 +55,11 @@
...
@@ -55,12 +55,11 @@
extern
policydb_t
*
policydb
;
extern
policydb_t
*
policydb
;
int
(
*
init_applet_main
[])
(
int
,
char
*
[])
=
{
magiskpolicy_main
,
magiskpolicy_main
,
NULL
};
int
(
*
init_applet_main
[])
(
int
,
char
*
[])
=
{
magiskpolicy_main
,
magiskpolicy_main
,
NULL
};
static
int
keepverity
=
0
,
keepencrypt
=
0
;
static
char
RAND_SOCKET_NAME
[
sizeof
(
SOCKET_NAME
)];
static
char
RAND_SOCKET_NAME
[
sizeof
(
SOCKET_NAME
)];
static
int
SOCKET_OFF
=
-
1
;
static
int
SOCKET_OFF
=
-
1
;
struct
cmdline
{
struct
cmdline
{
int
skip_initramfs
;
char
skip_initramfs
;
char
slot
[
3
];
char
slot
[
3
];
};
};
...
@@ -74,8 +73,7 @@ struct device {
...
@@ -74,8 +73,7 @@ struct device {
static
void
parse_cmdline
(
struct
cmdline
*
cmd
)
{
static
void
parse_cmdline
(
struct
cmdline
*
cmd
)
{
// cleanup
// cleanup
cmd
->
skip_initramfs
=
0
;
memset
(
cmd
,
0
,
sizeof
(
&
cmd
));
cmd
->
slot
[
0
]
=
'\0'
;
char
cmdline
[
4096
];
char
cmdline
[
4096
];
mkdir
(
"/proc"
,
0555
);
mkdir
(
"/proc"
,
0555
);
...
@@ -89,11 +87,13 @@ static void parse_cmdline(struct cmdline *cmd) {
...
@@ -89,11 +87,13 @@ static void parse_cmdline(struct cmdline *cmd) {
sscanf
(
tok
,
"androidboot.slot_suffix=%s"
,
cmd
->
slot
);
sscanf
(
tok
,
"androidboot.slot_suffix=%s"
,
cmd
->
slot
);
}
else
if
(
strncmp
(
tok
,
"androidboot.slot"
,
16
)
==
0
)
{
}
else
if
(
strncmp
(
tok
,
"androidboot.slot"
,
16
)
==
0
)
{
cmd
->
slot
[
0
]
=
'_'
;
cmd
->
slot
[
0
]
=
'_'
;
sscanf
(
tok
,
"androidboot.slot=%
s
"
,
cmd
->
slot
+
1
);
sscanf
(
tok
,
"androidboot.slot=%
c
"
,
cmd
->
slot
+
1
);
}
else
if
(
strcmp
(
tok
,
"skip_initramfs"
)
==
0
)
{
}
else
if
(
strcmp
(
tok
,
"skip_initramfs"
)
==
0
)
{
cmd
->
skip_initramfs
=
1
;
cmd
->
skip_initramfs
=
1
;
}
}
}
}
VLOG
(
"cmdline: skip_initramfs[%d] slot[%s]
\n
"
,
cmd
->
skip_initramfs
,
cmd
->
slot
);
}
}
static
void
parse_device
(
struct
device
*
dev
,
char
*
uevent
)
{
static
void
parse_device
(
struct
device
*
dev
,
char
*
uevent
)
{
...
@@ -148,24 +148,7 @@ static int setup_block(struct device *dev, const char *partname) {
...
@@ -148,24 +148,7 @@ static int setup_block(struct device *dev, const char *partname) {
return
0
;
return
0
;
}
}
static
void
fstab_patch_cb
(
int
dirfd
,
struct
dirent
*
entry
)
{
static
void
patch_ramdisk
()
{
if
(
entry
->
d_type
==
DT_REG
&&
strstr
(
entry
->
d_name
,
"fstab"
))
{
void
*
buf
;
size_t
_size
;
uint32_t
size
;
full_read_at
(
dirfd
,
entry
->
d_name
,
&
buf
,
&
_size
);
size
=
(
uint32_t
)
_size
;
/* Type conversion */
if
(
!
keepverity
)
patch_verity
(
&
buf
,
&
size
,
1
);
if
(
!
keepencrypt
)
patch_encryption
(
&
buf
,
&
size
);
int
fstab
=
xopenat
(
dirfd
,
entry
->
d_name
,
O_WRONLY
|
O_CLOEXEC
);
write
(
fstab
,
buf
,
size
);
close
(
fstab
);
}
}
static
void
patch_ramdisk
(
int
root
)
{
void
*
addr
;
void
*
addr
;
size_t
size
;
size_t
size
;
mmap_rw
(
"/init"
,
&
addr
,
&
size
);
mmap_rw
(
"/init"
,
&
addr
,
&
size
);
...
@@ -183,25 +166,6 @@ static void patch_ramdisk(int root) {
...
@@ -183,25 +166,6 @@ static void patch_ramdisk(int root) {
write
(
fd
,
addr
,
size
);
write
(
fd
,
addr
,
size
);
close
(
fd
);
close
(
fd
);
free
(
addr
);
free
(
addr
);
/* Disabled for now */
// char *key, *value;
// full_read("/.backup/.magisk", &addr, &size);
// for (char *tok = strtok(addr, "\n"); tok; tok = strtok(NULL, "\n")) {
// key = tok;
// value = strchr(tok, '=') + 1;
// value[-1] = '\0';
// if (strcmp(key, "KEEPVERITY") == 0)
// keepverity = strcmp(value, "true") == 0;
// else if (strcmp(key, "KEEPFORCEENCRYPT") == 0)
// keepencrypt = strcmp(value, "true") == 0;
// }
// excl_list = (char *[]) { "system_root", "system", "vendor", NULL };
// in_order_walk(root, fstab_patch_cb);
// if (!keepverity)
// unlink("/verity_key");
}
}
static
int
strend
(
const
char
*
s1
,
const
char
*
s2
)
{
static
int
strend
(
const
char
*
s1
,
const
char
*
s2
)
{
...
@@ -465,98 +429,98 @@ int main(int argc, char *argv[]) {
...
@@ -465,98 +429,98 @@ int main(int argc, char *argv[]) {
dump_magiskrc
(
"/overlay/init.magisk.rc"
,
0750
);
dump_magiskrc
(
"/overlay/init.magisk.rc"
,
0750
);
mkdir
(
"/overlay/sbin"
,
0755
);
mkdir
(
"/overlay/sbin"
,
0755
);
dump_magisk
(
"/overlay/sbin/magisk"
,
0755
);
dump_magisk
(
"/overlay/sbin/magisk"
,
0755
);
patch_socket_name
(
"/overlay/sbin/magisk"
);
mkdir
(
"/overlay/root"
,
0755
);
mkdir
(
"/overlay/root"
,
0755
);
link
(
"/init"
,
"/overlay/root/magiskinit"
);
link
(
"/init"
,
"/overlay/root/magiskinit"
);
patch_socket_name
(
"/overlay/sbin/magisk"
);
struct
cmdline
cmd
;
struct
cmdline
cmd
;
parse_cmdline
(
&
cmd
);
parse_cmdline
(
&
cmd
);
VLOG
(
"cmdline: skip_initramfs=[%d] slot_suffix=[%s]
\n
"
,
cmd
.
skip_initramfs
,
cmd
.
slot
);
/* ***********
* Initialize
* ***********/
int
root
=
open
(
"/"
,
O_RDONLY
|
O_CLOEXEC
);
int
root
=
open
(
"/"
,
O_RDONLY
|
O_CLOEXEC
);
if
(
cmd
.
skip_initramfs
)
{
if
(
cmd
.
skip_initramfs
)
{
// Exclude overlay folder
excl_list
=
(
char
*
[])
{
"overlay"
,
".backup"
,
NULL
};
// Clear rootfs
// Clear rootfs
excl_list
=
(
char
*
[])
{
"overlay"
,
".backup"
,
NULL
};
frm_rf
(
root
);
}
else
if
(
access
(
"/ramdisk.cpio.xz"
,
R_OK
)
==
0
)
{
// High compression mode
void
*
addr
;
size_t
size
;
mmap_ro
(
"/ramdisk.cpio.xz"
,
&
addr
,
&
size
);
int
fd
=
creat
(
"/ramdisk.cpio"
,
0
);
unxz
(
addr
,
size
,
fd
);
munmap
(
addr
,
size
);
close
(
fd
);
struct
vector
v
;
vec_init
(
&
v
);
parse_cpio
(
&
v
,
"/ramdisk.cpio"
);
excl_list
=
(
char
*
[])
{
"overlay"
,
".backup"
,
NULL
};
frm_rf
(
root
);
frm_rf
(
root
);
chdir
(
"/"
);
cpio_extract_all
(
&
v
);
cpio_vec_destroy
(
&
v
);
}
else
{
// Revert original init binary
unlink
(
"/init"
);
link
(
"/.backup/init"
,
"/init"
);
}
mkdir
(
"/sys"
,
0755
);
/* ************
xmount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
NULL
);
* Early Mount
* ************/
// If skip_initramfs or using split policies, we need early mount
if
(
cmd
.
skip_initramfs
||
access
(
"/sepolicy"
,
R_OK
)
!=
0
)
{
char
partname
[
32
];
char
partname
[
32
];
snprintf
(
partname
,
sizeof
(
partname
),
"system%s"
,
cmd
.
slot
);
struct
device
dev
;
struct
device
dev
;
setup_block
(
&
dev
,
partname
);
mkdir
(
"/system_root"
,
0755
);
// Mount sysfs
xmount
(
dev
.
path
,
"/system_root"
,
"ext4"
,
MS_RDONLY
,
NULL
);
mkdir
(
"/sys"
,
0755
);
int
system_root
=
open
(
"/system_root"
,
O_RDONLY
|
O_CLOEXEC
);
xmount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
NULL
);
// Exclude system folder
// Mount system
excl_list
=
(
char
*
[])
{
"system"
,
NULL
};
snprintf
(
partname
,
sizeof
(
partname
),
"system%s"
,
cmd
.
slot
);
clone_dir
(
system_root
,
root
);
setup_block
(
&
dev
,
partname
);
mkdir
(
"/system"
,
0755
);
if
(
cmd
.
skip_initramfs
)
{
xmount
(
"/system_root/system"
,
"/system"
,
NULL
,
MS_BIND
,
NULL
);
mkdir
(
"/system_root"
,
0755
);
xmount
(
dev
.
path
,
"/system_root"
,
"ext4"
,
MS_RDONLY
,
NULL
);
int
system_root
=
open
(
"/system_root"
,
O_RDONLY
|
O_CLOEXEC
);
// Clone rootfs except /system
excl_list
=
(
char
*
[])
{
"system"
,
NULL
};
clone_dir
(
system_root
,
root
);
close
(
system_root
);
mkdir
(
"/system"
,
0755
);
xmount
(
"/system_root/system"
,
"/system"
,
NULL
,
MS_BIND
,
NULL
);
}
else
{
xmount
(
dev
.
path
,
"/system"
,
"ext4"
,
MS_RDONLY
,
NULL
);
}
// Mount vendor
snprintf
(
partname
,
sizeof
(
partname
),
"vendor%s"
,
cmd
.
slot
);
snprintf
(
partname
,
sizeof
(
partname
),
"vendor%s"
,
cmd
.
slot
);
// We need to mount independent vendor partition
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
);
close
(
system_root
);
}
else
{
if
(
access
(
"/ramdisk.cpio.xz"
,
R_OK
)
==
0
)
{
// High compression mode
void
*
addr
;
size_t
size
;
mmap_ro
(
"/ramdisk.cpio.xz"
,
&
addr
,
&
size
);
int
fd
=
creat
(
"/ramdisk.cpio"
,
0
);
unxz
(
addr
,
size
,
fd
);
munmap
(
addr
,
size
);
close
(
fd
);
struct
vector
v
;
vec_init
(
&
v
);
parse_cpio
(
&
v
,
"/ramdisk.cpio"
);
excl_list
=
(
char
*
[])
{
"overlay"
,
".backup"
,
NULL
};
frm_rf
(
root
);
chdir
(
"/"
);
cpio_extract_all
(
&
v
);
cpio_vec_destroy
(
&
v
);
}
else
{
// Revert original init binary
unlink
(
"/init"
);
link
(
"/.backup/init"
,
"/init"
);
}
}
}
/* *************
* Patch rootfs
* *************/
// 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
overlay
=
open
(
"/overlay"
,
O_RDONLY
|
O_CLOEXEC
);
int
overlay
=
open
(
"/overlay"
,
O_RDONLY
|
O_CLOEXEC
);
mv_dir
(
overlay
,
root
);
mv_dir
(
overlay
,
root
);
close
(
overlay
);
rmdir
(
"/overlay"
);
patch_ramdisk
(
root
);
patch_ramdisk
();
if
(
patch_sepolicy
())
{
patch_sepolicy
();
/* Non skip_initramfs devices using separate sepolicy
* Mount /system and try to load again */
xmount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
NULL
);
struct
device
dev
;
setup_block
(
&
dev
,
"system"
);
xmount
(
dev
.
path
,
"/system"
,
"ext4"
,
MS_RDONLY
,
NULL
);
// We need to mount independent vendor partition
if
(
setup_block
(
&
dev
,
"vendor"
)
==
0
)
xmount
(
dev
.
path
,
"/vendor"
,
"ext4"
,
MS_RDONLY
,
NULL
);
patch_sepolicy
();
umount
(
"/system"
);
}
close
(
overlay
);
close
(
STDIN_FILENO
);
close
(
STDIN_FILENO
);
close
(
STDOUT_FILENO
);
close
(
STDOUT_FILENO
);
close
(
STDERR_FILENO
);
close
(
STDERR_FILENO
);
...
@@ -570,8 +534,9 @@ int main(int argc, char *argv[]) {
...
@@ -570,8 +534,9 @@ int main(int argc, char *argv[]) {
// Clean up
// Clean up
close
(
root
);
close
(
root
);
if
(
!
cmd
.
skip_initramfs
)
umount
(
"/system"
);
umount
(
"/vendor"
);
umount
(
"/vendor"
);
rmdir
(
"/overlay"
);
// Finally, give control back!
// Finally, give control back!
execv
(
"/init"
,
argv
);
execv
(
"/init"
,
argv
);
...
...
scripts/magisk_uninstaller.sh
View file @
a94fa811
...
@@ -103,4 +103,4 @@ rm -rf /cache/*magisk* /cache/unblock /data/*magisk* /data/cache/*magisk* /data
...
@@ -103,4 +103,4 @@ rm -rf /cache/*magisk* /cache/unblock /data/*magisk* /data/cache/*magisk* /data
/data/user
*
/
*
/magisk.db /data/user
*
/
*
/com.topjohnwu.magisk /data/user
*
/
*
/.tmp.magisk.config
\
/data/user
*
/
*
/magisk.db /data/user
*
/
*
/com.topjohnwu.magisk /data/user
*
/
*
/.tmp.magisk.config
\
/data/adb/
*
magisk
*
2>/dev/null
/data/adb/
*
magisk
*
2>/dev/null
$BOOTMODE
&&
reboot
$BOOTMODE
&&
/system/bin/
reboot
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