Skip to content

Commit f072b27

Browse files
jones-drewavpatel
authored andcommitted
RISC-V: KVM: Use correct restricted types
__le32 and __le64 types should be used with le32_to_cpu() and le64_to_cpu() and __user is needed for pointers referencing guest memory, as sparse helpfully points out. Fixes: e9f12b5 ("RISC-V: KVM: Implement SBI STA extension") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202401020142.lwFEDK5v-lkp@intel.com/ Signed-off-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Atish Patra <atishp@rivosinc.com> Signed-off-by: Anup Patel <anup@brainfault.org>
1 parent 3752219 commit f072b27

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

arch/riscv/kvm/vcpu_sbi_sta.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@ void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu)
2626
{
2727
gpa_t shmem = vcpu->arch.sta.shmem;
2828
u64 last_steal = vcpu->arch.sta.last_steal;
29-
u32 *sequence_ptr, sequence;
30-
u64 *steal_ptr, steal;
29+
__le32 __user *sequence_ptr;
30+
__le64 __user *steal_ptr;
31+
__le32 sequence_le;
32+
__le64 steal_le;
33+
u32 sequence;
34+
u64 steal;
3135
unsigned long hva;
3236
gfn_t gfn;
3337

@@ -47,22 +51,22 @@ void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu)
4751
return;
4852
}
4953

50-
sequence_ptr = (u32 *)(hva + offset_in_page(shmem) +
54+
sequence_ptr = (__le32 __user *)(hva + offset_in_page(shmem) +
5155
offsetof(struct sbi_sta_struct, sequence));
52-
steal_ptr = (u64 *)(hva + offset_in_page(shmem) +
56+
steal_ptr = (__le64 __user *)(hva + offset_in_page(shmem) +
5357
offsetof(struct sbi_sta_struct, steal));
5458

55-
if (WARN_ON(get_user(sequence, sequence_ptr)))
59+
if (WARN_ON(get_user(sequence_le, sequence_ptr)))
5660
return;
5761

58-
sequence = le32_to_cpu(sequence);
62+
sequence = le32_to_cpu(sequence_le);
5963
sequence += 1;
6064

6165
if (WARN_ON(put_user(cpu_to_le32(sequence), sequence_ptr)))
6266
return;
6367

64-
if (!WARN_ON(get_user(steal, steal_ptr))) {
65-
steal = le64_to_cpu(steal);
68+
if (!WARN_ON(get_user(steal_le, steal_ptr))) {
69+
steal = le64_to_cpu(steal_le);
6670
vcpu->arch.sta.last_steal = READ_ONCE(current->sched_info.run_delay);
6771
steal += vcpu->arch.sta.last_steal - last_steal;
6872
WARN_ON(put_user(cpu_to_le64(steal), steal_ptr));

0 commit comments

Comments
 (0)