Unverified Commit 3747e12f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9658 KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Zucheng <zhengzucheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/27NQLZEGVVWT4Z3YOH7UQF4YJKNQG7DZ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4H1 
 
Link:https://gitee.com/openeuler/kernel/pulls/9658

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents ad84be9f 30773f76

arch/powerpc/kvm/powerpc.c

+2 −2
Original line number Diff line number Diff line
@@ -1994,9 +1994,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
	{

		struct kvm_enable_cap cap;

		r = -EFAULT;

		vcpu_load(vcpu);

		if (copy_from_user(&cap, argp, sizeof(cap)))

			goto out;

		vcpu_load(vcpu);

		r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);

		vcpu_put(vcpu);

		break;
@@ -2020,9 +2020,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
	case KVM_DIRTY_TLB: {

		struct kvm_dirty_tlb dirty;

		r = -EFAULT;

		vcpu_load(vcpu);

		if (copy_from_user(&dirty, argp, sizeof(dirty)))

			goto out;

		vcpu_load(vcpu);

		r = kvm_vcpu_ioctl_dirty_tlb(vcpu, &dirty);

		vcpu_put(vcpu);

		break;