Commit 30773f76 authored Jul 02, 2024 by Nicholas Piggin Committed by Zheng Zucheng Jul 02, 2024

KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak

stable inclusion
from stable-v5.10.54
commit e14ef1095387f764d95614d3ec9e4d07c82a3533
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9R4H1
CVE: CVE-2021-47296

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e14ef1095387f764d95614d3ec9e4d07c82a3533



--------------------------------

[ Upstream commit bc4188a2 ]

vcpu_put is not called if the user copy fails. This can result in preempt
notifier corruption and crashes, among other issues.

Fixes: b3cebfe8 ("KVM: PPC: Move vcpu_load/vcpu_put down to each ioctl case in kvm_arch_vcpu_ioctl")
Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210716024310.164448-2-npiggin@gmail.com


Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Acked-by: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: Zheng Zucheng <zhengzucheng@huawei.com>

parent 91b7ac39

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;