From cac54be7ff77e2e220d7b477c82984b26157e09b Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Mon, 13 Sep 2021 16:09:14 +1000 Subject: executor/common_kvm_ppc64: fuzz more hypercalls At the moment syzkaller only fuzzes the platform architecture defined hypercalls. However there are custom defined hypercalls which KVM handles, they make 2 groups - an extension of hypercalls and so-called ultracalls which are handled by the secure VM firmware but in absense of the secure VM facility, KVM gets to handle those as errors. This enables the two extra groups of hypercalls in KVM. If not enabled, KVM exits to let the userspace handle them (which syzkaller does not do). Signed-off-by: Alexey Kardashevskiy --- executor/common_kvm_ppc64.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'executor') diff --git a/executor/common_kvm_ppc64.h b/executor/common_kvm_ppc64.h index 26ccc118d..1063e587b 100644 --- a/executor/common_kvm_ppc64.h +++ b/executor/common_kvm_ppc64.h @@ -391,14 +391,14 @@ static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volat // Hypercalls need to be enable so we enable them all here to // allow fuzzing #define MAX_HCALL 0x450 - for (unsigned hcall = 4; hcall < MAX_HCALL; hcall += 4) { - struct kvm_enable_cap cap = { - .cap = KVM_CAP_PPC_ENABLE_HCALL, - .flags = 0, - .args = {hcall, 1}, - }; - ioctl(vmfd, KVM_ENABLE_CAP, &cap); - } + for (unsigned hcall = 4; hcall < MAX_HCALL; hcall += 4) + kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_ENABLE_HCALL, hcall, 1); + + for (unsigned hcall = 0xf000; hcall < 0xf810; hcall += 4) + kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_ENABLE_HCALL, hcall, 1); + + for (unsigned hcall = 0xef00; hcall < 0xef20; hcall += 4) + kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_ENABLE_HCALL, hcall, 1); // Only a few of many RTAS calls are actually in the KVM and the rest // are handled in QEMU, enable the KVM handling for those 4 here. -- cgit mrf-deployment