]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
riscv: kvm: return SBI_ERR_FAILURE for pmu_event_info() when OOM
authorOsama Abdelkader <osama.abdelkader@gmail.com>
Thu, 14 May 2026 17:36:41 +0000 (19:36 +0200)
committerAnup Patel <anup@brainfault.org>
Mon, 18 May 2026 04:49:18 +0000 (10:19 +0530)
kvm_riscv_vcpu_pmu_event_info() returned -ENOMEM from the
SBI extension handler, which caused kvm_riscv_vcpu_sbi_ecall()
to abort KVM_RUN and surface the error to userspace instead of
completing the ECALL with a negative SBI error in a0.
Use SBI_ERR_FAILURE and the normal retdata path, matching other PMU
handlers and kvm_sbi_ext_pmu_handler comment.

Fixes: e309fd113b9f ("RISC-V: KVM: Implement get event info function")
Cc: stable@vger.kernel.org
Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260514173642.41448-2-osama.abdelkader@gmail.com
Signed-off-by: Anup Patel <anup@brainfault.org>
arch/riscv/kvm/vcpu_pmu.c

index 91aa0155a420da5745aafc3ba33e3282f4760116..bb46dcbfb24da7521b896a206d3f0e35863b3f0c 100644 (file)
@@ -501,8 +501,10 @@ int kvm_riscv_vcpu_pmu_event_info(struct kvm_vcpu *vcpu, unsigned long saddr_low
        }
 
        einfo = kzalloc(shmem_size, GFP_KERNEL);
-       if (!einfo)
-               return -ENOMEM;
+       if (!einfo) {
+               ret = SBI_ERR_FAILURE;
+               goto out;
+       }
 
        ret = kvm_vcpu_read_guest(vcpu, shmem, einfo, shmem_size);
        if (ret) {