MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ramdisk patches

Browse Source
This commit is contained in:
topjohnwu 2017-09-25 13:44:00 +08:00
parent 9b4ae8fcc5
commit 73064a816d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jni/magiskboot/cpio.c
View File

@ -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) {
} 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) {
} }
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;
} }
} }
} }