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
e139e877
Commit
e139e877
authored
Dec 28, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix faulty magiskboot ramdisk patch code
parent
d52d7cfb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
34 deletions
+41
-34
main.c
core/jni/magiskboot/main.c
+4
-4
ramdisk.c
core/jni/magiskboot/ramdisk.c
+3
-1
pattern.c
core/jni/utils/pattern.c
+34
-29
No files found.
core/jni/magiskboot/main.c
View file @
e139e877
...
...
@@ -73,12 +73,12 @@ static void usage(char *arg0) {
" --dtb-<cmd> <dtb>
\n
"
" Do dtb related cmds to <dtb> (modifications are done directly)
\n
"
" Supported commands:
\n
"
"
-
dump
\n
"
" dump
\n
"
" Dump all contents from dtb for debugging
\n
"
"
-
test
\n
"
" test
\n
"
" Check if fstab has verity/avb flags
\n
"
" Return value: 0/no flags 1/flag exists"
"
-
patch
\n
"
" Return value: 0/no flags 1/flag exists
\n
"
" patch
\n
"
" Search for fstab and remove verity/avb
\n
"
"
\n
"
" --compress[=method] <infile> [outfile]
\n
"
...
...
core/jni/magiskboot/ramdisk.c
View file @
e139e877
...
...
@@ -9,6 +9,8 @@
#include "cpio.h"
static
void
cpio_patch
(
struct
vector
*
v
,
int
keepverity
,
int
keepforceencrypt
)
{
fprintf
(
stderr
,
"Patch with flag KEEPVERITY=[%s] KEEPFORCEENCRYPT=[%s]
\n
"
,
keepverity
?
"true"
:
"false"
,
keepforceencrypt
?
"true"
:
"false"
);
cpio_entry
*
e
;
vec_for_each
(
v
,
e
)
{
if
(
!
e
)
continue
;
...
...
@@ -134,7 +136,7 @@ static void cpio_backup(struct vector *v, struct vector *bak, const char *orig,
backup
=
1
;
fprintf
(
stderr
,
"Backup mismatch entry: "
);
}
else
{
// Someting new in ramdisk, record in rem
// Somet
h
ing new in ramdisk, record in rem
++
j
;
rem
->
data
=
xrealloc
(
rem
->
data
,
rem
->
filesize
+
strlen
(
n
->
filename
)
+
1
);
memcpy
(
rem
->
data
+
rem
->
filesize
,
n
->
filename
,
strlen
(
n
->
filename
)
+
1
);
...
...
core/jni/utils/pattern.c
View file @
e139e877
...
...
@@ -4,19 +4,19 @@
#include "utils.h"
static
int
check_verity_pattern
(
const
char
*
s
)
{
int
pos
=
0
;
if
(
s
[
0
]
==
','
)
++
pos
;
if
(
strncmp
(
s
+
pos
,
"verify"
,
6
)
==
0
)
pos
+=
6
;
else
if
(
strncmp
(
s
+
pos
,
"avb"
,
3
)
==
0
)
pos
+=
3
;
int
skip
=
0
;
if
(
s
[
0
]
==
','
)
++
skip
;
if
(
strncmp
(
s
+
skip
,
"verify"
,
6
)
==
0
)
skip
+=
6
;
else
if
(
strncmp
(
s
+
skip
,
"avb"
,
3
)
==
0
)
skip
+=
3
;
else
return
-
1
;
if
(
s
[
pos
]
==
'='
)
{
while
(
s
[
pos
]
!=
'\0'
&&
s
[
pos
]
!=
' '
&&
s
[
pos
]
!=
'\n'
&&
s
[
pos
]
!=
','
)
++
pos
;
if
(
s
[
skip
]
==
'='
)
{
while
(
s
[
skip
]
!=
'\0'
&&
s
[
skip
]
!=
' '
&&
s
[
skip
]
!=
'\n'
&&
s
[
skip
]
!=
','
)
++
skip
;
}
return
pos
;
return
skip
;
}
static
int
check_encryption_pattern
(
const
char
*
s
)
{
...
...
@@ -59,34 +59,39 @@ void patch_init_rc(void **buf, size_t *size) {
}
int
patch_verity
(
void
**
buf
,
uint32_t
*
size
,
int
patch
)
{
int
skip
,
found
=
0
;
for
(
int
pos
=
0
;
pos
<
*
size
;
++
pos
)
{
if
((
skip
=
check_verity_pattern
(
*
buf
+
pos
))
>
0
)
{
found
=
1
;
fprintf
(
stderr
,
"%s pattern [%.*s]
\n
"
,
patch
?
"Remove"
:
"Found"
,
skip
,
(
char
*
)
*
buf
+
pos
);
if
(
patch
)
{
memcpy
(
*
buf
+
pos
,
*
buf
+
pos
+
skip
,
*
size
-
pos
-
skip
);
memset
(
*
buf
+
*
size
-
skip
,
'\0'
,
skip
);
*
size
-=
skip
;
}
else
{
pos
+=
skip
-
1
;
}
int
skip
,
src_size
=
*
size
;
char
*
src
=
*
buf
,
*
patched
=
patch
?
xcalloc
(
src_size
,
1
)
:
NULL
;
for
(
int
read
=
0
,
write
=
0
;
read
<
src_size
;
++
read
,
++
write
)
{
if
((
skip
=
check_verity_pattern
(
src
+
read
))
>
0
)
{
if
(
!
patch
)
return
1
;
fprintf
(
stderr
,
"Remove pattern [%.*s]
\n
"
,
skip
,
src
+
read
);
read
+=
skip
;
*
size
-=
skip
;
}
if
(
patch
)
patched
[
write
]
=
src
[
read
];
}
return
found
;
free
(
*
buf
);
*
buf
=
patched
;
return
0
;
}
void
patch_encryption
(
void
**
buf
,
uint32_t
*
size
)
{
int
skip
;
for
(
int
pos
=
0
;
pos
<
*
size
;
++
pos
)
{
if
((
skip
=
check_encryption_pattern
(
*
buf
+
pos
))
>
0
)
{
fprintf
(
stderr
,
"Replace pattern [%.*s] with [encryptable]
\n
"
,
skip
,
(
char
*
)
*
buf
+
pos
);
memcpy
(
*
buf
+
pos
,
"encryptable"
,
11
);
memcpy
(
*
buf
+
pos
+
11
,
*
buf
+
pos
+
skip
,
*
size
-
pos
-
skip
);
memset
(
*
buf
+
*
size
-
skip
+
11
,
'\0'
,
skip
-
11
);
int
skip
,
src_size
=
*
size
;
char
*
src
=
*
buf
,
*
patched
=
xcalloc
(
src_size
,
1
);
for
(
int
read
=
0
,
write
=
0
;
read
<
src_size
;
++
read
,
++
write
)
{
if
((
skip
=
check_encryption_pattern
(
src
+
read
))
>
0
)
{
fprintf
(
stderr
,
"Replace pattern [%.*s] with [encryptable]
\n
"
,
skip
,
src
+
read
);
memcpy
(
patched
+
read
,
"encryptable"
,
11
);
read
+=
skip
;
write
+=
11
;
*
size
-=
(
skip
-
11
);
}
patched
[
write
]
=
src
[
read
];
}
free
(
*
buf
);
*
buf
=
patched
;
}
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