diff --git a/DMPATCH/dmpatch.c b/DMPATCH/dmpatch.c index 3dd79474..d711a3a0 100644 --- a/DMPATCH/dmpatch.c +++ b/DMPATCH/dmpatch.c @@ -58,6 +58,7 @@ typedef struct ko_param unsigned long blkdev_put_addr; unsigned long bdev_open_addr; unsigned long kv_subminor; + unsigned long bdev_file_open_addr; unsigned long padding[1]; }ko_param; @@ -318,12 +319,19 @@ static unsigned int notrace dmpatch_patch_claim_ptr(void) if (dmpatch_kv_above(6, 7, 0)) /* >= 6.7 kernel */ { - vdebug("Get addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr); + vdebug("Get addr: 0x%lx %lu open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr); offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr); if (offset1 == 0) { vdebug("call bdev_open_addr Not found\n"); - return 1; + + vdebug("Get addr: 0x%lx %lu file_open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr); + offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr); + if (offset1 == 0) + { + vdebug("call bdev_file_open_addr Not found\n"); + return 1; + } } } else @@ -339,6 +347,7 @@ static unsigned int notrace dmpatch_patch_claim_ptr(void) return 1; } } + vdebug("call addr1:0x%lx call addr2:0x%lx\n", g_ko_param.sym_get_addr + offset1, diff --git a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh index 99badaf1..2ebf801a 100644 --- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh +++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh @@ -356,6 +356,10 @@ ventoy_dm_patch() { vtlog "get bdev_open_by_dev address $vtLine" bdev_open_addr=$(echo $vtLine | $AWK '{print $1}') + vtLine=$($VTOY_PATH/tool/vtoyksym bdev_file_open_by_dev $VTOY_PATH/kallsyms) + vtlog "get bdev_file_open_by_dev address $vtLine" + bdev_file_open_addr=$(echo $vtLine | $AWK '{print $1}') + if $GREP -m1 -q 'close_table_device.isra' $VTOY_PATH/kallsyms; then vtLine=$($VTOY_PATH/tool/vtoyksym close_table_device.isra $VTOY_PATH/kallsyms) @@ -398,7 +402,7 @@ ventoy_dm_patch() { vtlog put_addr=$put_addr put_size=$put_size vtlog blkdev_get_addr=$blkdev_get_addr blkdev_put_addr=$blkdev_put_addr vtlog kprobe_reg_addr=$kprobe_reg_addr kprobe_unreg_addr=$kprobe_unreg_addr - vtlog ro_addr=$ro_addr rw_addr=$rw_addr printk_addr=$printk_addr bdev_open_addr=$bdev_open_addr + vtlog ro_addr=$ro_addr rw_addr=$rw_addr printk_addr=$printk_addr bdev_open_addr=$bdev_open_addr bdev_file_open_addr=$bdev_file_open_addr if [ "$get_addr" = "0" -o "$put_addr" = "0" ]; then vtlog "Invalid symbol address" @@ -460,7 +464,7 @@ ventoy_dm_patch() { #step2: fill parameters vtPgsize=$($VTOY_PATH/tool/vtoyksym -p) - vtPrams="$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 $vtKVMajor $vtIBT $vtKVMinor $blkdev_get_addr $blkdev_put_addr $vtKVSubMinor $bdev_open_addr $vtDebug" + vtPrams="$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 $vtKVMajor $vtIBT $vtKVMinor $blkdev_get_addr $blkdev_put_addr $vtKVSubMinor $bdev_open_addr $bdev_file_open_addr $vtDebug" vtlog "$VTOY_PATH/tool/vtoykmod -f $vtPrams" diff --git a/IMG/cpio_x86/ventoy/tool/dm_patch_64.ko b/IMG/cpio_x86/ventoy/tool/dm_patch_64.ko index 47f8d73c..4253fcac 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/IMG/cpio_x86/ventoy/tool/dm_patch_ibt_64.ko b/IMG/cpio_x86/ventoy/tool/dm_patch_ibt_64.ko index 91c31f0e..cfbd46a3 100644 Binary files a/IMG/cpio_x86/ventoy/tool/dm_patch_ibt_64.ko and b/IMG/cpio_x86/ventoy/tool/dm_patch_ibt_64.ko differ diff --git a/VtoyTool/vtoykmod.c b/VtoyTool/vtoykmod.c index 06c20608..1e73db2a 100644 --- a/VtoyTool/vtoykmod.c +++ b/VtoyTool/vtoykmod.c @@ -193,6 +193,7 @@ typedef struct ko_param unsigned long blkdev_put_addr; unsigned long bdev_open_addr; unsigned long kv_subminor; + unsigned long bdev_file_open_addr; unsigned long padding[1]; }ko_param; @@ -581,6 +582,7 @@ int vtoykmod_fill_param(char **argv) param->blkdev_put_addr = strtoul(argv[15], NULL, 16); param->kv_subminor = strtoul(argv[16], NULL, 10); param->bdev_open_addr = strtoul(argv[17], NULL, 16); + param->bdev_file_open_addr = strtoul(argv[18], NULL, 16); debug("pgsize=%lu (%s)\n", param->pgsize, argv[1]); debug("printk_addr=0x%lx (%s)\n", param->printk_addr, argv[2]); @@ -599,6 +601,7 @@ int vtoykmod_fill_param(char **argv) debug("blkdev_put_addr=0x%lx (%s)\n", param->blkdev_put_addr, argv[15]); debug("kv_subminor=%lu (%s)\n", param->kv_subminor, argv[16]); debug("bdev_open_addr=0x%lx (%s)\n", param->bdev_open_addr, argv[17]); + debug("bdev_file_open_addr=0x%lx (%s)\n", param->bdev_file_open_addr, argv[18]); break; } diff --git a/VtoyTool/vtoytool/00/vtoytool_32 b/VtoyTool/vtoytool/00/vtoytool_32 index 8ce94e98..2c662faa 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 3edbed59..d9985638 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 7229c3a3..58beda87 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 db997a15..2b9f11d5 100644 Binary files a/VtoyTool/vtoytool/00/vtoytool_m64e and b/VtoyTool/vtoytool/00/vtoytool_m64e differ