X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/b32eda4262355f09045f9f3d82fff767492a78c7..c7693d4ecd7950ff7696aba13aa8e44a16c24f4e:/DMPATCH/dmpatch.c diff --git a/DMPATCH/dmpatch.c b/DMPATCH/dmpatch.c index e508a06..e4ed6f9 100644 --- a/DMPATCH/dmpatch.c +++ b/DMPATCH/dmpatch.c @@ -53,6 +53,9 @@ typedef struct ko_param unsigned long sym_put_size; unsigned long kv_major; unsigned long ibt; + unsigned long kv_minor; + unsigned long blkdev_get_addr; + unsigned long blkdev_put_addr; unsigned long padding[1]; }ko_param; @@ -78,15 +81,25 @@ static volatile ko_param g_ko_param = #define PATCH_OP_POS2 1 #define CODE_MATCH2(code, i) \ (code[i] == 0x0C && code[i + 1] == 0x80 && code[i + 2] == 0x89 && code[i + 3] == 0xC6) + +#define PATCH_OP_POS3 4 +#define CODE_MATCH3(code, i) \ + (code[i] == 0x44 && code[i + 1] == 0x89 && code[i + 2] == 0xe8 && code[i + 3] == 0x0c && code[i + 4] == 0x80) + + + + #elif defined(CONFIG_X86_32) #define PATCH_OP_POS1 2 #define CODE_MATCH1(code, i) \ (code[i] == 0x80 && code[i + 1] == 0xca && code[i + 2] == 0x80 && code[i + 3] == 0xe8) -#define PATCH_OP_POS2 2 -#define CODE_MATCH2(code, i) \ - (code[i] == 0x80 && code[i + 1] == 0xca && code[i + 2] == 0x80 && code[i + 3] == 0xe8) +#define PATCH_OP_POS2 PATCH_OP_POS1 +#define CODE_MATCH2 CODE_MATCH1 +#define PATCH_OP_POS3 PATCH_OP_POS1 +#define CODE_MATCH3 CODE_MATCH1 + #else #error "unsupported arch" @@ -140,10 +153,11 @@ static volatile ko_param g_ko_param = #define vdebug(fmt, args...) if(kprintf) kprintf(KERN_ERR fmt, ##args) +static unsigned int g_claim_ptr = 0; static unsigned char *g_get_patch[MAX_PATCH] = { NULL }; static unsigned char *g_put_patch[MAX_PATCH] = { NULL }; -static void notrace dmpatch_restore_code(unsigned char *opCode) +static void notrace dmpatch_restore_code(int bytes, unsigned char *opCode, unsigned int code) { unsigned long align; @@ -151,7 +165,14 @@ static void notrace dmpatch_restore_code(unsigned char *opCode) { align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize; set_mem_rw(align, 1); - *opCode = 0x80; + if (bytes == 1) + { + *opCode = (unsigned char)code; + } + else + { + *(unsigned int *)opCode = code; + } set_mem_ro(align, 1); } } @@ -173,7 +194,7 @@ static int notrace dmpatch_replace_code vdebug("patch for %s style[%d] 0x%lx %d\n", desc, style, addr, (int)size); - for (i = 0; i < (int)size - 4; i++) + for (i = 0; i < (int)size - 8; i++) { if (style == 1) { @@ -183,7 +204,7 @@ static int notrace dmpatch_replace_code cnt++; } } - else + else if (style == 2) { if (CODE_MATCH2(opCode, i) && cnt < MAX_PATCH) { @@ -191,8 +212,20 @@ static int notrace dmpatch_replace_code cnt++; } } + else if (style == 3) + { + if (CODE_MATCH3(opCode, i) && cnt < MAX_PATCH) + { + patch[cnt] = opCode + i + PATCH_OP_POS3; + cnt++; + } + } } + + + + if (cnt != expect || cnt >= MAX_PATCH) { vdebug("patch error: cnt=%d expect=%d\n", cnt, expect); @@ -213,6 +246,121 @@ static int notrace dmpatch_replace_code return 0; } +static unsigned long dmpatch_find_call_offset(unsigned long addr, unsigned long size, unsigned long func) +{ + unsigned long i = 0; + unsigned long dest; + unsigned char *opCode = NULL; + unsigned char aucOffset[8] = { 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF }; + + opCode = (unsigned char *)addr; + + for (i = 0; i + 4 < size; i++) + { + if (opCode[i] == 0xE8) + { + aucOffset[0] = opCode[i + 1]; + aucOffset[1] = opCode[i + 2]; + aucOffset[2] = opCode[i + 3]; + aucOffset[3] = opCode[i + 4]; + + dest = addr + i + 5 + *(unsigned long *)aucOffset; + if (dest == func) + { + return i; + } + } + } + + return 0; +} + +static unsigned int dmpatch_patch_claim_ptr(void) +{ + unsigned long i = 0; + unsigned long t = 0; + unsigned long offset1; + unsigned long offset2; + unsigned long align; + unsigned char *opCode = NULL; + + vdebug("Get addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr); + vdebug("Put addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr); + + opCode = (unsigned char *)g_ko_param.sym_get_addr; + for (i = 0; i < 4; i++) + { + vdebug("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", + opCode[i + 0], opCode[i + 1], opCode[i + 2], opCode[i + 3], + opCode[i + 4], opCode[i + 5], opCode[i + 6], opCode[i + 7], + opCode[i + 8], opCode[i + 9], opCode[i + 10], opCode[i + 11], + opCode[i + 12], opCode[i + 13], opCode[i + 14], opCode[i + 15]); + } + + offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr); + offset2 = dmpatch_find_call_offset(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr); + if (offset1 == 0 || offset2 == 0) + { + vdebug("call blkdev_get or blkdev_put Not found, %lu %lu\n", offset1, offset2); + return 1; + } + vdebug("call addr1:0x%lx call addr2:0x%lx\n", + g_ko_param.sym_get_addr + offset1, + g_ko_param.sym_put_addr + offset2); + + opCode = (unsigned char *)g_ko_param.sym_get_addr; + for (i = offset1 - 1, t = 0; (i > 0) && (t < 24); i--, t++) + { + /* rdx */ + if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc2) + { + g_claim_ptr = *(unsigned int *)(opCode + i + 3); + g_get_patch[0] = opCode + i + 3; + vdebug("claim_ptr(%08X) found at get addr 0x%lx\n", g_claim_ptr, g_ko_param.sym_get_addr + i + 3); + break; + } + } + + if (g_claim_ptr == 0) + { + vdebug("Claim_ptr not found in get\n"); + return 1; + } + + opCode = (unsigned char *)g_ko_param.sym_put_addr; + for (i = offset2 - 1, t = 0; (i > 0) && (t < 24); i--, t++) + { + /* rsi */ + if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc6) + { + if (*(unsigned int *)(opCode + i + 3) == g_claim_ptr) + { + vdebug("claim_ptr found at put addr 0x%lx\n", g_ko_param.sym_put_addr + i + 3); + g_put_patch[0] = opCode + i + 3; + break; + } + } + } + + if (g_put_patch[0] == 0) + { + vdebug("Claim_ptr not found in put\n"); + return 1; + } + + align = (unsigned long)g_get_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize; + set_mem_rw(align, 1); + *(unsigned int *)(g_get_patch[0]) = 0; + set_mem_ro(align, 1); + + align = (unsigned long)g_put_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize; + set_mem_rw(align, 1); + *(unsigned int *)(g_put_patch[0]) = 0; + set_mem_ro(align, 1); + + return 0; +} + #ifdef VTOY_IBT static __always_inline unsigned long long dmpatch_rdmsr(unsigned int msr) { @@ -275,7 +423,8 @@ static int notrace dmpatch_init(void) kprintf = (printk_pf)(g_ko_param.printk_addr); - vdebug("dmpatch_init start pagesize=%lu ...\n", g_ko_param.pgsize); + vdebug("dmpatch_init start pagesize=%lu kernel=%lu.%lu ...\n", + g_ko_param.pgsize, g_ko_param.kv_major, g_ko_param.kv_minor); if (g_ko_param.struct_size != sizeof(ko_param)) { @@ -294,13 +443,27 @@ static int notrace dmpatch_init(void) reg_kprobe = (kprobe_reg_pf)g_ko_param.reg_kprobe_addr; unreg_kprobe = (kprobe_unreg_pf)g_ko_param.unreg_kprobe_addr; - r = dmpatch_replace_code(1, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch); - if (r && g_ko_param.kv_major >= 5) + if (g_ko_param.kv_major > 6 || (g_ko_param.kv_major == 6 && g_ko_param.kv_minor >= 5)) { - vdebug("new patch dm_get_table_device...\n"); - r = dmpatch_replace_code(2, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch); + vdebug("new interface patch dm_get_table_device...\n"); + r = dmpatch_patch_claim_ptr(); } - + else + { + r = dmpatch_replace_code(1, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch); + if (r && g_ko_param.kv_major >= 5) + { + vdebug("new2 patch dm_get_table_device...\n"); + r = dmpatch_replace_code(2, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch); + } + + if (r && g_ko_param.kv_major >= 5) + { + vdebug("new3 patch dm_get_table_device...\n"); + r = dmpatch_replace_code(3, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch); + } + } + if (r) { rc = -EINVAL; @@ -308,7 +471,14 @@ static int notrace dmpatch_init(void) } vdebug("patch dm_get_table_device success\n"); - r = dmpatch_replace_code(1, g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch); + if (g_ko_param.kv_major >= 6 && g_ko_param.kv_minor >= 5) + { + r = 0; + } + else + { + r = dmpatch_replace_code(1, g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch); + } if (r) { rc = -EINVAL; @@ -340,10 +510,18 @@ static void notrace dmpatch_exit(void) msr = dmpatch_ibt_save(); } - for (i = 0; i < MAX_PATCH; i++) + if (g_claim_ptr) { - dmpatch_restore_code(g_get_patch[i]); - dmpatch_restore_code(g_put_patch[i]); + dmpatch_restore_code(4, g_get_patch[0], g_claim_ptr); + dmpatch_restore_code(4, g_put_patch[0], g_claim_ptr); + } + else + { + for (i = 0; i < MAX_PATCH; i++) + { + dmpatch_restore_code(1, g_get_patch[i], 0x80); + dmpatch_restore_code(1, g_put_patch[i], 0x80); + } } vdebug("dmpatch_exit success\n");