Skip to contentSkip to conversation

RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts

PATCH In review Osama Abdelkader 2 participants 2 messages Mar 11 – Mar 27

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts

When saddr_high != 0 on RV32, the goto out was unconditional, causing valid 64-bit addresses to be rejected. Only goto out when the address is invalid (64-bit host with saddr_high != 0).

Fixes c2f41ddbcdd7 ("RISC-V: KVM: Implement SBI PMU Snapshot feature")

---
v2:
- balance braces properly

---
 arch/riscv/kvm/vcpu_pmu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +4 -3
index 4d8d5e9aa53d..ec0c15726da9 100644
@@ -423,11 +423,12 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
 	saddr = saddr_low;
 
 	if (saddr_high != 0) {
-		if (IS_ENABLED(CONFIG_32BIT))
+		if (IS_ENABLED(CONFIG_32BIT)) {
 			saddr |= ((gpa_t)saddr_high << 32);
-		else
+		} else {
 			sbiret = SBI_ERR_INVALID_ADDRESS;
-		goto out;
+			goto out;
+		}
 	}
 
 	kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 8 lines · Osama Abdelkader

When saddr_high != 0 on RV32, the goto out was unconditional, causing valid 64-bit addresses to be rejected. Only goto out when the address is invalid (64-bit host with saddr_high != 0).

Fixes c2f41ddbcdd7 ("RISC-V: KVM: Implement SBI PMU Snapshot feature")

Queued this patch for Linux-7.1

Thanks,
Anup

Quoted 30 lines

---
v2:
- balance braces properly

---
 arch/riscv/kvm/vcpu_pmu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +4 -4
index 4d8d5e9aa53d..ec0c15726da9 100644
@@ -423,11 +423,12 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
        saddr = saddr_low;
 
        if (saddr_high != 0) {
-               if (IS_ENABLED(CONFIG_32BIT))
+               if (IS_ENABLED(CONFIG_32BIT)) {
                        saddr |= ((gpa_t)saddr_high << 32);
-               else
+               } else {
                        sbiret = SBI_ERR_INVALID_ADDRESS;
-               goto out;
+                       goto out;
+               }
        }
 
        kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
--

2.43.0