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
73064a81
Commit
73064a81
authored
Sep 25, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ramdisk patches
parent
9b4ae8fc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
12 deletions
+17
-12
cpio.c
jni/magiskboot/cpio.c
+17
-12
No files found.
jni/magiskboot/cpio.c
View file @
73064a81
...
@@ -206,7 +206,7 @@ static void cpio_test(struct vector *v) {
...
@@ -206,7 +206,7 @@ static void cpio_test(struct vector *v) {
static
void
cpio_patch
(
struct
vector
*
v
,
int
keepverity
,
int
keepforceencrypt
)
{
static
void
cpio_patch
(
struct
vector
*
v
,
int
keepverity
,
int
keepforceencrypt
)
{
cpio_entry
*
f
;
cpio_entry
*
f
;
int
skip
;
int
skip
,
write
;
vec_for_each
(
v
,
f
)
{
vec_for_each
(
v
,
f
)
{
if
(
strcmp
(
f
->
filename
,
"init.rc"
)
==
0
)
{
if
(
strcmp
(
f
->
filename
,
"init.rc"
)
==
0
)
{
void
*
new_data
=
patch_init_rc
(
f
->
data
,
&
f
->
filesize
);
void
*
new_data
=
patch_init_rc
(
f
->
data
,
&
f
->
filesize
);
...
@@ -215,13 +215,15 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
...
@@ -215,13 +215,15 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
}
else
{
}
else
{
if
(
!
keepverity
)
{
if
(
!
keepverity
)
{
if
(
strstr
(
f
->
filename
,
"fstab"
)
!=
NULL
&&
S_ISREG
(
f
->
mode
))
{
if
(
strstr
(
f
->
filename
,
"fstab"
)
!=
NULL
&&
S_ISREG
(
f
->
mode
))
{
for
(
int
i
=
0
;
i
<
f
->
filesize
;
++
i
)
{
write
=
0
;
if
((
skip
=
check_verity_pattern
(
f
->
data
+
i
))
>
0
)
{
for
(
int
read
=
0
;
read
<
f
->
filesize
;
++
write
,
++
read
)
{
fprintf
(
stderr
,
"Remove pattern [%.*s] in [%s]
\n
"
,
skip
,
f
->
data
+
i
,
f
->
filename
);
if
((
skip
=
check_verity_pattern
(
f
->
data
+
read
))
>
0
)
{
memcpy
(
f
->
data
+
i
,
f
->
data
+
i
+
skip
,
f
->
filesize
-
i
-
skip
);
fprintf
(
stderr
,
"Remove pattern [%.*s] in [%s]
\n
"
,
skip
,
f
->
data
+
read
,
f
->
filename
);
f
->
filesize
-
=
skip
;
read
+
=
skip
;
}
}
f
->
data
[
write
]
=
f
->
data
[
read
];
}
}
f
->
filesize
=
write
;
}
else
if
(
strcmp
(
f
->
filename
,
"verity_key"
)
==
0
)
{
}
else
if
(
strcmp
(
f
->
filename
,
"verity_key"
)
==
0
)
{
fprintf
(
stderr
,
"Remove [verity_key]
\n
"
);
fprintf
(
stderr
,
"Remove [verity_key]
\n
"
);
f
->
remove
=
1
;
f
->
remove
=
1
;
...
@@ -229,15 +231,18 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
...
@@ -229,15 +231,18 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
}
}
if
(
!
keepforceencrypt
)
{
if
(
!
keepforceencrypt
)
{
if
(
strstr
(
f
->
filename
,
"fstab"
)
!=
NULL
&&
S_ISREG
(
f
->
mode
))
{
if
(
strstr
(
f
->
filename
,
"fstab"
)
!=
NULL
&&
S_ISREG
(
f
->
mode
))
{
for
(
int
i
=
0
;
i
<
f
->
filesize
;
++
i
)
{
write
=
0
;
if
((
skip
=
check_encryption_pattern
(
f
->
data
+
i
))
>
0
)
{
for
(
int
read
=
0
;
read
<
f
->
filesize
;
++
write
,
++
read
)
{
fprintf
(
stderr
,
"Replace pattern [%.*s] with [encryptable] in [%s]
\n
"
,
skip
,
f
->
data
+
i
,
f
->
filename
);
if
((
skip
=
check_encryption_pattern
(
f
->
data
+
read
))
>
0
)
{
memcpy
(
f
->
data
+
i
,
"encryptable"
,
11
);
// assert(skip > 11)!
// assert(skip > 11)!
memcpy
(
f
->
data
+
i
+
11
,
f
->
data
+
i
+
skip
,
f
->
filesize
-
i
-
skip
);
fprintf
(
stderr
,
"Replace pattern [%.*s] with [encryptable] in [%s]
\n
"
,
skip
,
f
->
data
+
read
,
f
->
filename
);
f
->
filesize
=
f
->
filesize
-
skip
+
11
;
memcpy
(
f
->
data
+
write
,
"encryptable"
,
11
);
write
+=
11
;
read
+=
skip
;
}
}
f
->
data
[
write
]
=
f
->
data
[
read
];
}
}
f
->
filesize
=
write
;
}
}
}
}
}
}
...
...
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