Commit 0835ee26 authored by Osama Abdelkader's avatar Osama Abdelkader Committed by Anup Patel
Browse files

riscv: kvm: return SBI_ERR_FAILURE for pmu_snapshot_set_shmem() when OOM 



kvm_riscv_vcpu_pmu_snapshot_set_shmem() 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
ompleting 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: c2f41ddb ("RISC-V: KVM: Implement SBI PMU Snapshot feature")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarOsama Abdelkader <osama.abdelkader@gmail.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260514173642.41448-1-osama.abdelkader@gmail.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 653f17c7

arch/riscv/kvm/vcpu_pmu.c

+4 −2
Original line number Diff line number Diff line
@@ -453,8 +453,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s 
	}



	kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);

	if (!kvpmu->sdata)

		return -ENOMEM;

	if (!kvpmu->sdata) {

		sbiret = SBI_ERR_FAILURE;

		goto out;

	}



	/* No need to check writable slot explicitly as kvm_vcpu_write_guest does it internally */

	if (kvm_vcpu_write_guest(vcpu, saddr, kvpmu->sdata, snapshot_area_size)) {