Skip to contentSkip to conversation

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

PATCH Superseded Osama Abdelkader 2 participants 3 messages Mar 7 – Mar 11

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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")
---
 arch/riscv/kvm/vcpu_pmu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +3 -2
index 4d8d5e9aa53d..045099ca904b 100644
@@ -425,9 +425,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
 	if (saddr_high != 0) {
 		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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 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")
---
 arch/riscv/kvm/vcpu_pmu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +0 -0
index 4d8d5e9aa53d..045099ca904b 100644

arch/riscv/kvm/vcpu_pmu.c int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s · line 431

Quoted 9 lines
arch/riscv/kvm/vcpu_pmu.c +3 -2
@@ -425,9 +425,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
 	if (saddr_high != 0) {
 		if (IS_ENABLED(CONFIG_32BIT))
 			saddr |= ((gpa_t)saddr_high << 32);
-		else
+		else {
 			sbiret = SBI_ERR_INVALID_ADDRESS;
-		goto out;
+			goto out;
+		}

nit: Could add the {} to the if-arm too in order to keep things balanced. Otherwise,

Thanks,
drew

Quoted 11 lines
arch/riscv/kvm/vcpu_pmu.c +0 -0
 	}
 
 	kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
Signature · 7 lines
2.43.0


-- 
kvm-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kvm-riscv
#2 lore raw
Quoted 29 lines · Andrew Jones
Quoted 15 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")
---
 arch/riscv/kvm/vcpu_pmu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +0 -0
index 4d8d5e9aa53d..045099ca904b 100644

arch/riscv/kvm/vcpu_pmu.c int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s · line 431

Quoted 9 lines
arch/riscv/kvm/vcpu_pmu.c +3 -2
@@ -425,9 +425,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
 	if (saddr_high != 0) {
 		if (IS_ENABLED(CONFIG_32BIT))
 			saddr |= ((gpa_t)saddr_high << 32);
-		else
+		else {
 			sbiret = SBI_ERR_INVALID_ADDRESS;
-		goto out;
+			goto out;
+		}

nit: Could add the {} to the if-arm too in order to keep things balanced. Otherwise,

Quoted 5 lines

Thanks,
drew

Hi Andrew,
I'm going to do that in v2, thanks.
Thanks,
Osama

Quoted 11 lines
Quoted 11 lines
arch/riscv/kvm/vcpu_pmu.c +0 -0
 	}
 
 	kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
Signature · 7 lines
2.43.0


-- 
kvm-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kvm-riscv