Commit e73ba25f authored by Michal Luczaj's avatar Michal Luczaj Committed by Sean Christopherson
Browse files

KVM: x86: Simplify msr_io() 



As of commit bccf2150 ("KVM: Per-vcpu inodes"), __msr_io() doesn't
return a negative value. Remove unnecessary checks.

Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Link: https://lore.kernel.org/r/20230107001256.2365304-7-mhal@rbox.co


[sean: call out commit which left behind the unnecessary check]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 4559e6cf

arch/x86/kvm/x86.c

+3 −9
Original line number Diff line number Diff line
@@ -4291,8 +4291,8 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs, 
{

	struct kvm_msrs msrs;

	struct kvm_msr_entry *entries;

	int r, n;

	unsigned size;

	int r;



	r = -EFAULT;

	if (copy_from_user(&msrs, user_msrs, sizeof(msrs)))
@@ -4309,17 +4309,11 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs, 
		goto out;

	}



	r = n = __msr_io(vcpu, &msrs, entries, do_msr);

	if (r < 0)

		goto out_free;

	r = __msr_io(vcpu, &msrs, entries, do_msr);



	r = -EFAULT;

	if (writeback && copy_to_user(user_msrs->entries, entries, size))

		goto out_free;



	r = n;

		r = -EFAULT;



out_free:

	kfree(entries);

out:

	return r;