The "kvm_run->kvm_valid_regs" and "kvm_run->kvm_dirty_regs" variables are
u64 type.  We are only using the lowest 3 bits but we want to ensure that
the users are not passing invalid bits so that we can use the remaining
bits in the future.

However "sync_valid_fields" and kvm_sync_valid_fields() are u32 type so
the check only ensures that the lower 32 bits are clear.  Fix this by
changing the types to u64.

Fixes: 74c1807f6c4f ("KVM: x86: block KVM_CAP_SYNC_REGS if guest state is protected")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c841817a914a..c734ec0d809b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4597,7 +4597,7 @@ static bool kvm_is_vm_type_supported(unsigned long type)
 	return type < 32 && (kvm_caps.supported_vm_types & BIT(type));
 }
 
-static inline u32 kvm_sync_valid_fields(struct kvm *kvm)
+static inline u64 kvm_sync_valid_fields(struct kvm *kvm)
 {
 	return kvm && kvm->arch.has_protected_state ? 0 : KVM_SYNC_X86_VALID_FIELDS;
 }
@@ -11492,7 +11492,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
 {
 	struct kvm_queued_exception *ex = &vcpu->arch.exception;
 	struct kvm_run *kvm_run = vcpu->run;
-	u32 sync_valid_fields;
+	u64 sync_valid_fields;
 	int r;
 
 	r = kvm_mmu_post_init_vm(vcpu->kvm);
-- 
2.47.2

On Mon, 24 Mar 2025 13:51:28 +0300, Dan Carpenter wrote:
> The "kvm_run->kvm_valid_regs" and "kvm_run->kvm_dirty_regs" variables are
> u64 type.  We are only using the lowest 3 bits but we want to ensure that
> the users are not passing invalid bits so that we can use the remaining
> bits in the future.
> 
> However "sync_valid_fields" and kvm_sync_valid_fields() are u32 type so
> the check only ensures that the lower 32 bits are clear.  Fix this by
> changing the types to u64.
> 
> [...]

Applied to kvm-x86 fixes, thanks!

[1/1] KVM: x86: Check that the high 32bits are clear in kvm_arch_vcpu_ioctl_run()
      commit: a476cadf8ef1fbb9780581316f0199dfc62a81f2

--
https://github.com/kvm-x86/linux/tree/next