android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kernel: reject v3 and v3.1 signature scheme for manager verification

Browse Source
This commit is contained in:
weishu
2023-10-11 17:06:14 +08:00
parent a3b92d6fee
commit 8828939994
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/apk_sign.c
View File

@@ -123,13 +123,10 @@ check_v2_signature(char *path, unsigned expected_size, const char *expected_sha2
u64 size8, size_of_block; u64 size8, size_of_block;
loff_t pos; loff_t pos;
bool block_valid;
const int NOT_EXIST = 0; bool v2_signing_valid = false;
const int INVALID = 1; bool v3_signing_exist = false;
const int VALID = 2; bool v3_1_signing_exist = false;
int v2_signing_status = NOT_EXIST;
int v3_signing_status = NOT_EXIST;
int i; int i;
struct file *fp = ksu_filp_open_compat(path, O_RDONLY, 0); struct file *fp = ksu_filp_open_compat(path, O_RDONLY, 0);
@@ -188,13 +185,14 @@ check_v2_signature(char *path, unsigned expected_size, const char *expected_sha2
offset = 4; offset = 4;
pr_info("id: 0x%08x\n", id); pr_info("id: 0x%08x\n", id);
if (id == 0x7109871au) { if (id == 0x7109871au) {
block_valid = check_block(fp, &size4, &pos, &offset, v2_signing_valid = check_block(fp, &size4, &pos, &offset,
expected_size, expected_sha256); expected_size, expected_sha256);
v2_signing_status = block_valid ? VALID : INVALID;
} else if (id == 0xf05368c0u) { } else if (id == 0xf05368c0u) {
block_valid = check_block(fp, &size4, &pos, &offset, // http://aospxref.com/android-14.0.0_r2/xref/frameworks/base/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java#73
expected_size, expected_sha256); v3_signing_exist = true;
v3_signing_status = block_valid ? VALID : INVALID; } else if (id == 0x1b93ad61u) {
// http://aospxref.com/android-14.0.0_r2/xref/frameworks/base/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java#74
v3_1_signing_exist = true;
} }
pos += (size8 - offset); pos += (size8 - offset);
} }
@@ -202,9 +200,12 @@ check_v2_signature(char *path, unsigned expected_size, const char *expected_sha2
clean: clean:
filp_close(fp, 0); filp_close(fp, 0);
return (v2_signing_status == NOT_EXIST && v3_signing_status == VALID) || if (v3_signing_exist || v3_1_signing_exist) {
(v2_signing_status == VALID && v3_signing_status == NOT_EXIST) || pr_err("Unexpected v3 signature scheme found!\n");
(v2_signing_status == VALID && v3_signing_status == VALID); return false;
}
return v2_signing_valid;
} }
#ifdef CONFIG_KSU_DEBUG #ifdef CONFIG_KSU_DEBUG