diff --git a/DMPATCH/dmpatch.c b/DMPATCH/dmpatch.c
index bcadc3de..359c5c3f 100644
--- a/DMPATCH/dmpatch.c
+++ b/DMPATCH/dmpatch.c
@@ -51,7 +51,8 @@ typedef struct ko_param
unsigned long sym_get_size;
unsigned long sym_put_addr;
unsigned long sym_put_size;
- unsigned long padding[3];
+ unsigned long kv_major;
+ unsigned long padding[2];
}ko_param;
#pragma pack()
@@ -69,13 +70,23 @@ static volatile ko_param g_ko_param =
};
#if defined(CONFIG_X86_64)
-#define PATCH_OP_POS 3
-#define CODE_MATCH(code, i) \
+#define PATCH_OP_POS1 3
+#define CODE_MATCH1(code, i) \
(code[i] == 0x40 && code[i + 1] == 0x80 && code[i + 2] == 0xce && code[i + 3] == 0x80)
+
+#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)
+
#elif defined(CONFIG_X86_32)
-#define PATCH_OP_POS 2
-#define CODE_MATCH(code, i) \
+#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)
+
#else
#error "unsupported arch"
#endif
@@ -100,6 +111,7 @@ static void notrace dmpatch_restore_code(unsigned char *opCode)
static int notrace dmpatch_replace_code
(
+ int style,
unsigned long addr,
unsigned long size,
int expect,
@@ -112,14 +124,25 @@ static int notrace dmpatch_replace_code
unsigned long align;
unsigned char *opCode = (unsigned char *)addr;
- vdebug("patch for %s 0x%lx %d\n", desc, addr, (int)size);
+ vdebug("patch for %s style[%d] 0x%lx %d\n", desc, style, addr, (int)size);
for (i = 0; i < (int)size - 4; i++)
{
- if (CODE_MATCH(opCode, i) && cnt < MAX_PATCH)
+ if (style == 1)
{
- patch[cnt] = opCode + i + PATCH_OP_POS;
- cnt++;
+ if (CODE_MATCH1(opCode, i) && cnt < MAX_PATCH)
+ {
+ patch[cnt] = opCode + i + PATCH_OP_POS1;
+ cnt++;
+ }
+ }
+ else
+ {
+ if (CODE_MATCH2(opCode, i) && cnt < MAX_PATCH)
+ {
+ patch[cnt] = opCode + i + PATCH_OP_POS2;
+ cnt++;
+ }
}
}
@@ -169,7 +192,13 @@ 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(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch);
+ 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("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);
+ }
+
if (r)
{
rc = -EINVAL;
@@ -177,7 +206,7 @@ static int notrace dmpatch_init(void)
}
vdebug("patch dm_get_table_device success\n");
- r = dmpatch_replace_code(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch);
+ 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;
diff --git a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
index b367895b..80765e3a 100644
--- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
@@ -305,6 +305,9 @@ ventoy_dm_patch() {
if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then
printk_addr=$($GREP ' printk$' /proc/kallsyms | $AWK '{print $1}')
+ if [ -z "$printk_addr" ]; then
+ printk_addr=$($GREP ' _printk$' /proc/kallsyms | $AWK '{print $1}')
+ fi
vtDebug="-v"
else
printk_addr=0
@@ -367,8 +370,8 @@ ventoy_dm_patch() {
#step2: fill parameters
vtPgsize=$($VTOY_PATH/tool/vtoyksym -p)
- vtlog "$VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug"
- $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug
+ vtlog "$VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtKv $vtDebug"
+ $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtKv $vtDebug
$BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName
diff --git a/IMG/cpio_x86/ventoy/tool/dm_patch_64.ko b/IMG/cpio_x86/ventoy/tool/dm_patch_64.ko
index 9ce8df1d..b1fc4f1a 100644
Binary files a/IMG/cpio_x86/ventoy/tool/dm_patch_64.ko and b/IMG/cpio_x86/ventoy/tool/dm_patch_64.ko differ
diff --git a/VtoyTool/vtoykmod.c b/VtoyTool/vtoykmod.c
index f8d97d49..5ffd9623 100644
--- a/VtoyTool/vtoykmod.c
+++ b/VtoyTool/vtoykmod.c
@@ -176,7 +176,8 @@ typedef struct ko_param
unsigned long sym_get_size;
unsigned long sym_put_addr;
unsigned long sym_put_size;
- unsigned long padding[3];
+ unsigned long kv_major;
+ unsigned long padding[2];
}ko_param;
#pragma pack()
@@ -484,6 +485,7 @@ int vtoykmod_fill_param(char **argv)
param->sym_put_size = strtoul(argv[8], NULL, 10);
param->reg_kprobe_addr = strtoul(argv[9], NULL, 16);
param->unreg_kprobe_addr = strtoul(argv[10], NULL, 16);
+ param->kv_major = (unsigned long)(argv[11][0] - '0');
debug("pgsize=%lu (%s)\n", param->pgsize, argv[1]);
debug("printk_addr=0x%lx (%s)\n", param->printk_addr, argv[2]);
@@ -495,6 +497,7 @@ int vtoykmod_fill_param(char **argv)
debug("sym_put_size=%lu (%s)\n", param->sym_put_size, argv[8]);
debug("reg_kprobe_addr=0x%lx (%s)\n", param->reg_kprobe_addr, argv[9]);
debug("unreg_kprobe_addr=0x%lx (%s)\n", param->unreg_kprobe_addr, argv[10]);
+ debug("kv_major=%lu (%s)\n", param->kv_major, argv[11]);
break;
}
diff --git a/VtoyTool/vtoytool/00/vtoytool_32 b/VtoyTool/vtoytool/00/vtoytool_32
index 90da6ce4..e2bca24d 100644
Binary files a/VtoyTool/vtoytool/00/vtoytool_32 and b/VtoyTool/vtoytool/00/vtoytool_32 differ
diff --git a/VtoyTool/vtoytool/00/vtoytool_64 b/VtoyTool/vtoytool/00/vtoytool_64
index 0c04940e..f9d5cbbe 100644
Binary files a/VtoyTool/vtoytool/00/vtoytool_64 and b/VtoyTool/vtoytool/00/vtoytool_64 differ
diff --git a/VtoyTool/vtoytool/00/vtoytool_aa64 b/VtoyTool/vtoytool/00/vtoytool_aa64
index fc34a6c7..fb43c352 100644
Binary files a/VtoyTool/vtoytool/00/vtoytool_aa64 and b/VtoyTool/vtoytool/00/vtoytool_aa64 differ
diff --git a/VtoyTool/vtoytool/00/vtoytool_m64e b/VtoyTool/vtoytool/00/vtoytool_m64e
index d2047dd7..690be305 100644
Binary files a/VtoyTool/vtoytool/00/vtoytool_m64e and b/VtoyTool/vtoytool/00/vtoytool_m64e differ