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
b100d0c5
Commit
b100d0c5
authored
Jan 15, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert DTB fstab changes
parent
76061296
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
45 deletions
+57
-45
gradle.properties
gradle.properties
+1
-1
twostage.cpp
native/jni/init/twostage.cpp
+51
-24
dtb.cpp
native/jni/magiskboot/dtb.cpp
+5
-20
No files found.
gradle.properties
View file @
b100d0c5
...
@@ -27,6 +27,6 @@ android.injected.testOnly=false
...
@@ -27,6 +27,6 @@ android.injected.testOnly=false
kapt.incremental.apt
=
true
kapt.incremental.apt
=
true
# Magisk
# Magisk
magisk.versionCode
=
2120
1
magisk.versionCode
=
2120
2
magisk.ndkVersion
=
21d
magisk.ndkVersion
=
21d
magisk.fullNdkVersion
=
21.3.6528147
magisk.fullNdkVersion
=
21.3.6528147
native/jni/init/twostage.cpp
View file @
b100d0c5
...
@@ -57,36 +57,63 @@ void FirstStageInit::prepare() {
...
@@ -57,36 +57,63 @@ void FirstStageInit::prepare() {
}
}
exit_loop
:
exit_loop
:
if
(
fstab_file
[
0
]
==
'\0'
)
{
// Try to load dt fstab
LOGI
(
"Cannot find fstab file in ramdisk!
\n
"
);
return
;
}
// Parse and load fstab file
vector
<
fstab_entry
>
fstab
;
vector
<
fstab_entry
>
fstab
;
file_readline
(
fstab_file
,
[
&
](
string_view
l
)
->
bool
{
read_dt_fstab
(
fstab
);
if
(
l
[
0
]
==
'#'
||
l
.
length
()
==
1
)
return
true
;
char
*
line
=
(
char
*
)
l
.
data
();
int
dev0
,
dev1
,
mnt_point0
,
mnt_point1
,
type0
,
type1
,
if
(
!
fstab
.
empty
())
{
mnt_flags0
,
mnt_flags1
,
fsmgr_flags0
,
fsmgr_flags1
;
// Dump dt fstab to fstab file in rootfs and force init to use it instead
sscanf
(
line
,
"%n%*s%n %n%*s%n %n%*s%n %n%*s%n %n%*s%n"
,
// All dt fstab entries should be first_stage_mount
&
dev0
,
&
dev1
,
&
mnt_point0
,
&
mnt_point1
,
&
type0
,
&
type1
,
for
(
auto
&
entry
:
fstab
)
{
&
mnt_flags0
,
&
mnt_flags1
,
&
fsmgr_flags0
,
&
fsmgr_flags1
);
if
(
!
str_contains
(
entry
.
fsmgr_flags
,
"first_stage_mount"
))
{
if
(
!
entry
.
fsmgr_flags
.
empty
())
entry
.
fsmgr_flags
+=
','
;
entry
.
fsmgr_flags
+=
"first_stage_mount"
;
}
}
fstab_entry
entry
;
if
(
fstab_file
[
0
]
==
'\0'
)
{
const
char
*
suffix
=
cmd
->
fstab_suffix
[
0
]
?
cmd
->
fstab_suffix
:
(
cmd
->
hardware
[
0
]
?
cmd
->
hardware
:
(
cmd
->
hardware_plat
[
0
]
?
cmd
->
hardware_plat
:
nullptr
));
if
(
suffix
==
nullptr
)
{
LOGE
(
"Cannot determine fstab suffix!
\n
"
);
return
;
}
sprintf
(
fstab_file
,
"fstab.%s"
,
suffix
);
}
set_info
(
dev
);
// Patch init to force IsDtFstabCompatible() return false
set_info
(
mnt_point
);
auto
init
=
mmap_data
::
rw
(
"/init"
);
set_info
(
type
);
init
.
patch
({
make_pair
(
"android,fstab"
,
"xxx"
)
});
set_info
(
mnt_flags
);
}
else
{
set_info
(
fsmgr_flags
);
// Parse and load the fstab file
file_readline
(
fstab_file
,
[
&
](
string_view
l
)
->
bool
{
if
(
l
[
0
]
==
'#'
||
l
.
length
()
==
1
)
return
true
;
char
*
line
=
(
char
*
)
l
.
data
();
int
dev0
,
dev1
,
mnt_point0
,
mnt_point1
,
type0
,
type1
,
mnt_flags0
,
mnt_flags1
,
fsmgr_flags0
,
fsmgr_flags1
;
sscanf
(
line
,
"%n%*s%n %n%*s%n %n%*s%n %n%*s%n %n%*s%n"
,
&
dev0
,
&
dev1
,
&
mnt_point0
,
&
mnt_point1
,
&
type0
,
&
type1
,
&
mnt_flags0
,
&
mnt_flags1
,
&
fsmgr_flags0
,
&
fsmgr_flags1
);
fstab_entry
entry
;
fstab
.
emplace_back
(
std
::
move
(
entry
));
set_info
(
dev
);
return
true
;
set_info
(
mnt_point
);
});
set_info
(
type
);
set_info
(
mnt_flags
);
set_info
(
fsmgr_flags
);
fstab
.
emplace_back
(
std
::
move
(
entry
));
return
true
;
});
}
{
{
LOGD
(
"Write fstab file: %s
\n
"
,
fstab_file
);
LOGD
(
"Write fstab file: %s
\n
"
,
fstab_file
);
...
...
native/jni/magiskboot/dtb.cpp
View file @
b100d0c5
...
@@ -124,52 +124,37 @@ static void dtb_print(const char *file, bool fstab) {
...
@@ -124,52 +124,37 @@ static void dtb_print(const char *file, bool fstab) {
munmap
(
dtb
,
size
);
munmap
(
dtb
,
size
);
}
}
[[
maybe_unused
]]
static
bool
dtb_patch_rebuild
(
uint8_t
*
dtb
,
size_t
dtb_sz
,
const
char
*
file
);
static
bool
dtb_patch_rebuild
(
uint8_t
*
dtb
,
size_t
dtb_sz
,
const
char
*
file
);
static
bool
dtb_patch
(
const
char
*
file
)
{
static
bool
dtb_patch
(
const
char
*
file
)
{
bool
keep_verity
=
check_env
(
"KEEPVERITY"
);
bool
keep_verity
=
check_env
(
"KEEPVERITY"
);
bool
have_system
=
false
;
vector
<
pair
<
char
*
,
int
>>
flags_list
;
size_t
size
;
size_t
size
;
uint8_t
*
dtb
;
uint8_t
*
dtb
;
fprintf
(
stderr
,
"Loading dtbs from [%s]
\n
"
,
file
);
fprintf
(
stderr
,
"Loading dtbs from [%s]
\n
"
,
file
);
mmap_rw
(
file
,
dtb
,
size
);
mmap_rw
(
file
,
dtb
,
size
);
run_finally
f
([
=
]{
munmap
(
dtb
,
size
);
});
// First traverse through DTB to determine whether we need a rebuild
bool
patched
=
false
;
int
dtb_num
=
0
;
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
if
(
memcmp
(
dtb
+
i
,
FDT_MAGIC_STR
,
4
)
==
0
)
{
if
(
memcmp
(
dtb
+
i
,
FDT_MAGIC_STR
,
4
)
==
0
)
{
auto
fdt
=
dtb
+
i
;
auto
fdt
=
dtb
+
i
;
if
(
int
fstab
=
find_fstab
(
fdt
);
fstab
>=
0
)
{
if
(
int
fstab
=
find_fstab
(
fdt
);
fstab
>=
0
)
{
int
node
;
int
node
;
fdt_for_each_subnode
(
node
,
fdt
,
fstab
)
{
fdt_for_each_subnode
(
node
,
fdt
,
fstab
)
{
const
char
*
name
=
fdt_get_name
(
fdt
,
node
,
nullptr
);
if
(
!
keep_verity
)
{
if
(
!
keep_verity
)
{
int
len
;
int
len
;
char
*
value
=
(
char
*
)
fdt_getprop
(
fdt
,
node
,
"fsmgr_flags"
,
&
len
);
char
*
value
=
(
char
*
)
fdt_getprop
(
fdt
,
node
,
"fsmgr_flags"
,
&
len
);
flags_list
.
emplace_back
(
value
,
len
)
;
patched
|=
patch_verity
(
value
,
len
)
!=
len
;
}
}
if
(
name
==
"system"
sv
)
have_system
=
true
;
}
}
}
}
i
+=
fdt_totalsize
(
fdt
)
-
1
;
i
+=
fdt_totalsize
(
fdt
)
-
1
;
++
dtb_num
;
}
}
}
}
if
(
!
have_system
)
{
munmap
(
dtb
,
size
);
// Patch in place with rw mmap
return
patched
;
bool
patched
=
false
;
for
(
auto
&
[
value
,
len
]
:
flags_list
)
patched
|=
patch_verity
(
value
,
len
)
!=
len
;
return
patched
;
}
else
{
// Need to rebuild dtb due to additional props
return
dtb_patch_rebuild
(
dtb
,
size
,
file
);
}
}
}
int
dtb_commands
(
int
argc
,
char
*
argv
[])
{
int
dtb_commands
(
int
argc
,
char
*
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