Skip to content

Commit bc4188a

Browse files
npigginmpe
authored andcommitted
KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak
vcpu_put is not called if the user copy fails. This can result in preempt notifier corruption and crashes, among other issues. Fixes: b3cebfe ("KVM: PPC: Move vcpu_load/vcpu_put down to each ioctl case in kvm_arch_vcpu_ioctl") Reported-by: Alexey Kardashevskiy <[email protected]> Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent bd31ecf commit bc4188a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/powerpc/kvm/powerpc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,9 +2048,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
20482048
{
20492049
struct kvm_enable_cap cap;
20502050
r = -EFAULT;
2051-
vcpu_load(vcpu);
20522051
if (copy_from_user(&cap, argp, sizeof(cap)))
20532052
goto out;
2053+
vcpu_load(vcpu);
20542054
r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);
20552055
vcpu_put(vcpu);
20562056
break;
@@ -2074,9 +2074,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
20742074
case KVM_DIRTY_TLB: {
20752075
struct kvm_dirty_tlb dirty;
20762076
r = -EFAULT;
2077-
vcpu_load(vcpu);
20782077
if (copy_from_user(&dirty, argp, sizeof(dirty)))
20792078
goto out;
2079+
vcpu_load(vcpu);
20802080
r = kvm_vcpu_ioctl_dirty_tlb(vcpu, &dirty);
20812081
vcpu_put(vcpu);
20822082
break;

0 commit comments

Comments
 (0)