KVM: cleanup DR6/DR7 reserved bits checks
Paolo Bonzini
maintainerPATCH 1/1 KVM: cleanup DR6/DR7 reserved bits checks
kvm_dr6_valid and kvm_dr7_valid check that bits 63:32 are zero. Using them makes it easier to review the code for inconsistencies.
Signed-off-by Paolo Bonzini <[email protected]>
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -4414,9 +4414,9 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,if (dbgregs->flags)return -EINVAL ; -if (dbgregs->dr6 & ~0xffffffffull ) +if (!kvm_dr6_valid (dbgregs->dr6))return -EINVAL ; -if (dbgregs->dr7 & ~0xffffffffull ) +if (!kvm_dr7_valid (dbgregs->dr7))return -EINVAL ;memcpy (vcpu->arch.db, dbgregs->db,sizeof (vcpu->arch.db));
Signature · 1 line
2.26.2
Quoted 13 lines · Paolo Bonzini
kvm_dr6_validandkvm_dr7_validcheck that bits 63:32 are zero. Using them makes it easier to review the code for inconsistencies.Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +0
-0
arch/x86/kvm/x86.c static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu, · line 4417
Quoted 4 lines
arch/x86/kvm/x86.c +0
-1@@ -4414,9 +4414,9 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,if (dbgregs->flags)return -EINVAL ; -if (dbgregs->dr6 & ~0xffffffffull )
Oof, you weren't kidding.
Reviewed-by Sean Christopherson <[email protected]>
Quoted 10 lines
arch/x86/kvm/x86.c +2
-1+if (!kvm_dr6_valid (dbgregs->dr6))return -EINVAL ; -if (dbgregs->dr7 & ~0xffffffffull ) +if (!kvm_dr7_valid (dbgregs->dr7))return -EINVAL ;memcpy (vcpu->arch.db, dbgregs->db,sizeof (vcpu->arch.db));Signature · 1 line
2.26.2