diff options
| author | Osama Abdelkader <osama.abdelkader@gmail.com> | 2026-05-14 19:36:41 +0200 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2026-05-18 10:19:18 +0530 |
| commit | 0e9d0e7a7c78db7aa1c13796c65cfe0aefa54a5b (patch) | |
| tree | dd3fb3af7c8550154e2aaedc2b0ebd21c2a552d4 /arch/riscv/kvm | |
| parent | 0835ee26938e15eccd70f7d33da386b6490f9449 (diff) | |
| download | lwn-0e9d0e7a7c78db7aa1c13796c65cfe0aefa54a5b.tar.gz lwn-0e9d0e7a7c78db7aa1c13796c65cfe0aefa54a5b.zip | |
riscv: kvm: return SBI_ERR_FAILURE for pmu_event_info() when OOM
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>
Diffstat (limited to 'arch/riscv/kvm')
| -rw-r--r-- | arch/riscv/kvm/vcpu_pmu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c index 91aa0155a420..bb46dcbfb24d 100644 --- a/arch/riscv/kvm/vcpu_pmu.c +++ b/arch/riscv/kvm/vcpu_pmu.c @@ -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) { |