From 3dfced0c70773d7544132b47a2766fddc4a6ff48 Mon Sep 17 00:00:00 2001 From: Marios Pomonis Date: Mon, 31 Mar 2025 00:16:52 -0700 Subject: executor/kvm: set up X86-64 SYZOS This commit prepares adding the X86-64 SYZOS by declaring the relevant functions, updating their ARM64 versions and adding placeholders. --- pkg/vminfo/linux_syscalls.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkg/vminfo/linux_syscalls.go') diff --git a/pkg/vminfo/linux_syscalls.go b/pkg/vminfo/linux_syscalls.go index e3755bdbc..589f52123 100644 --- a/pkg/vminfo/linux_syscalls.go +++ b/pkg/vminfo/linux_syscalls.go @@ -79,10 +79,10 @@ var linuxSyscallChecks = map[string]func(*checkContext, *prog.Syscall) string{ "syz_usb_control_io": linuxCheckUSBEmulation, "syz_usb_ep_write": linuxCheckUSBEmulation, "syz_usb_ep_read": linuxCheckUSBEmulation, - "syz_kvm_setup_cpu": linuxSyzKvmSetupCPUSupported, + "syz_kvm_setup_cpu": linuxSyzKvmSupported, "syz_kvm_vgic_v3_setup": linuxSyzSupportedOnArm64, - "syz_kvm_setup_syzos_vm": linuxSyzSupportedOnArm64, - "syz_kvm_add_vcpu": linuxSyzSupportedOnArm64, + "syz_kvm_setup_syzos_vm": linuxSyzKvmSupported, + "syz_kvm_add_vcpu": linuxSyzKvmSupported, "syz_kvm_assert_syzos_uexit": linuxSyzSupportedOnArm64, "syz_kvm_assert_reg": linuxSyzSupportedOnArm64, "syz_emit_vhci": linuxVhciInjectionSupported, @@ -174,13 +174,13 @@ func linuxCheckUSBEmulation(ctx *checkContext, call *prog.Syscall) string { const unsupportedArch = "unsupported arch" -func linuxSyzKvmSetupCPUSupported(ctx *checkContext, call *prog.Syscall) string { +func linuxSyzKvmSupported(ctx *checkContext, call *prog.Syscall) string { switch call.Name { - case "syz_kvm_setup_cpu$x86": + case "syz_kvm_setup_cpu$x86", "syz_kvm_setup_syzos_vm$x86", "syz_kvm_add_vcpu$x86": if ctx.target.Arch == targets.AMD64 || ctx.target.Arch == targets.I386 { return "" } - case "syz_kvm_setup_cpu$arm64": + case "syz_kvm_setup_cpu$arm64", "syz_kvm_setup_syzos_vm$arm64", "syz_kvm_add_vcpu$arm64": if ctx.target.Arch == targets.ARM64 { return "" } -- cgit mrf-deployment