From 184fe589c4e27b7e7dcc12a43900b1c2d363e200 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Wed, 17 Sep 2025 12:40:08 +0200 Subject: sys/linux/test: add syz_kvm_assert_syzos_kvm_exit() to amd64 tests Not strictly necessary, because syz_kvm_assert_syzos_uexit() is checking the exit reason, but should test the pseudo-syscall itself. --- sys/linux/test/amd64-syz_kvm_setup_syzos_vm | 7 ++++++- sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid | 6 +++++- sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm index 09d6cfe27..0e13a0337 100644 --- a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm +++ b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm @@ -23,7 +23,12 @@ syz_kvm_assert_syzos_uexit$x86(r5, 0x0) # ioctl$KVM_RUN(r3, AUTO, 0x0) syz_kvm_assert_syzos_uexit$x86(r5, 0xaaaa) -# Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END. + +# Run till the end of guest_main(). # ioctl$KVM_RUN(r3, AUTO, 0x0) + +# Ensure that exit reason is KVM_EXIT_MMIO and uexit code is UEXIT_END. +# +syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6) syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff) diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid index 34468c8cd..b950fb3a3 100644 --- a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid +++ b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid @@ -11,7 +11,11 @@ r3 = syz_kvm_add_vcpu$x86(r2, &AUTO={0x0, &AUTO=[@cpuid={AUTO, AUTO, {0x1, 0x0}} r4 = ioctl$KVM_GET_VCPU_MMAP_SIZE(r0, AUTO) r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0) -# Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END. +# Run till the end of guest_main(). # ioctl$KVM_RUN(r3, AUTO, 0x0) + +# Ensure that exit reason is KVM_EXIT_MMIO and uexit code is UEXIT_END. +# +syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6) syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff) diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr index 519432ca5..2ecf90804 100644 --- a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr +++ b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr @@ -11,7 +11,11 @@ r3 = syz_kvm_add_vcpu$x86(r2, &AUTO={0x0, &AUTO=[@wrmsr={AUTO, AUTO, {0x1b, 0xff r4 = ioctl$KVM_GET_VCPU_MMAP_SIZE(r0, AUTO) r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0) -# Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END. +# Run till the end of guest_main(). # ioctl$KVM_RUN(r3, AUTO, 0x0) + +# Ensure that exit reason is KVM_EXIT_MMIO and uexit code is UEXIT_END. +# +syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6) syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff) -- cgit mrf-deployment