If the program can execute up to this point, indicating that
kvm_vcpu_write_guest() returns 0, and the actual value of
SBI_SUCCESS is also 0. At this time, ret does not need to be
assigned a value of 0.

Fixes: e309fd113b9f ("RISC-V: KVM: Implement get event info function")

Signed-off-by: Qiang Ma <maqianga@uniontech.com>
---
 arch/riscv/kvm/vcpu_pmu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c
index a2fae70ee174..4d8d5e9aa53d 100644
--- a/arch/riscv/kvm/vcpu_pmu.c
+++ b/arch/riscv/kvm/vcpu_pmu.c
@@ -494,12 +494,9 @@ int kvm_riscv_vcpu_pmu_event_info(struct kvm_vcpu *vcpu, unsigned long saddr_low
 	}
 
 	ret = kvm_vcpu_write_guest(vcpu, shmem, einfo, shmem_size);
-	if (ret) {
+	if (ret)
 		ret = SBI_ERR_INVALID_ADDRESS;
-		goto free_mem;
-	}
 
-	ret = 0;
 free_mem:
 	kfree(einfo);
 out:
-- 
2.20.1

On Mon, Dec 29, 2025 at 12:56 PM Qiang Ma <maqianga@uniontech.com> wrote:
>
> If the program can execute up to this point, indicating that
> kvm_vcpu_write_guest() returns 0, and the actual value of
> SBI_SUCCESS is also 0. At this time, ret does not need to be
> assigned a value of 0.
>
> Fixes: e309fd113b9f ("RISC-V: KVM: Implement get event info function")
>
> Signed-off-by: Qiang Ma <maqianga@uniontech.com>

Simplified commit description and queued it for Linux-6.19 fixes.

Reviewed-by: Anup Patel <anup@brainfault.org>

Thanks,
Anup

> ---
>  arch/riscv/kvm/vcpu_pmu.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c
> index a2fae70ee174..4d8d5e9aa53d 100644
> --- a/arch/riscv/kvm/vcpu_pmu.c
> +++ b/arch/riscv/kvm/vcpu_pmu.c
> @@ -494,12 +494,9 @@ int kvm_riscv_vcpu_pmu_event_info(struct kvm_vcpu *vcpu, unsigned long saddr_low
>         }
>
>         ret = kvm_vcpu_write_guest(vcpu, shmem, einfo, shmem_size);
> -       if (ret) {
> +       if (ret)
>                 ret = SBI_ERR_INVALID_ADDRESS;
> -               goto free_mem;
> -       }
>
> -       ret = 0;
>  free_mem:
>         kfree(einfo);
>  out:
> --
> 2.20.1
>