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

修复

Browse Source
This commit is contained in:
liankong
2025-03-30 02:02:53 +08:00
parent 217e44d131
commit 1306acc017
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
kernel/kpm/kpm.c
View File

@@ -406,33 +406,52 @@ typedef enum {
RELOC_OP_PAGE RELOC_OP_PAGE
} reloc_op_t; } reloc_op_t;
// 移植自内核 arch/arm64/kernel/insn.c typedef enum {
AARCH64_INSN_IMM_16, // 16-bit 立即数（MOVZ/MOVK）
AARCH64_INSN_IMM_26, // 26-bit 跳转偏移（B/BL）
AARCH64_INSN_IMM_ADR, // 21-bit 页偏移（ADR/ADRP）
AARCH64_INSN_IMM_19 // 19-bit 条件跳转
} aarch64_insn_imm_type;
/* 编码立即数到指令 */
static u32 aarch64_insn_encode_immediate(u32 insn, s64 imm, int shift, int bits)
{
u32 mask = (BIT(bits) - 1) << shift;
return (insn & ~mask) | ((imm & (BIT(bits) - 1)) << shift);
}
/* 修补指令中的立即数字段 */
int aarch64_insn_patch_imm(void *addr, aarch64_insn_imm_type type, s64 imm) int aarch64_insn_patch_imm(void *addr, aarch64_insn_imm_type type, s64 imm)
{ {
u32 insn = le32_to_cpu(*(u32 *)addr); u32 insn = le32_to_cpu(*(u32 *)addr);
u32 new_insn; u32 new_insn;
switch (type) { switch (type) {
case AARCH64_INSN_IMM_16: // MOVZ/MOVK 的 16-bit 立即数 case AARCH64_INSN_IMM_16:
new_insn = aarch64_insn_encode_immediate(type, insn, imm); /* MOVZ/MOVK: imm[15:0] → shift=5, bits=16 */
new_insn = aarch64_insn_encode_immediate(insn, imm, 5, 16);
break; break;
case AARCH64_INSN_IMM_26: // B/BL 的 26-bit 偏移 case AARCH64_INSN_IMM_26:
new_insn = aarch64_insn_encode_offset(insn, imm, 26); /* B/BL: offset[25:0] → shift=0, bits=26 */
new_insn = aarch64_insn_encode_immediate(insn, imm, 0, 26);
break; break;
case AARCH64_INSN_IMM_ADR: // ADR 的 21-bit 页偏移 case AARCH64_INSN_IMM_ADR:
new_insn = aarch64_insn_encode_offset(insn, imm, 21); /* ADR/ADRP: imm[20:0] → shift=5, bits=21 */
new_insn = aarch64_insn_encode_immediate(insn, imm, 5, 21);
break; break;
case AARCH64_INSN_IMM_19: // 条件跳转的 19-bit 偏移 case AARCH64_INSN_IMM_19:
new_insn = aarch64_insn_encode_offset(insn, imm, 19); /* 条件跳转: offset[18:0] → shift=5, bits=19 */
new_insn = aarch64_insn_encode_immediate(insn, imm, 5, 19);
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
/* 写入新指令并刷新缓存 */
*(u32 *)addr = cpu_to_le32(new_insn); *(u32 *)addr = cpu_to_le32(new_insn);
flush_icache_range((unsigned long)addr, (unsigned long)addr + 4);
return 0; return 0;
} }
/* 指令编码辅助函数 */ /* 指令编码辅助函数 */
static int reloc_data(reloc_op_t op, void *loc, u64 val, int len) static int reloc_data(reloc_op_t op, void *loc, u64 val, int len)
{ {