Skip to content

Commit b689e86

Browse files
bonzinigregkh
authored andcommitted
KVM: x86: fix missed SRCU usage in kvm_lapic_set_vapic_addr
commit 7301d6a upstream. Reported by syzkaller: [ INFO: suspicious RCU usage. ] 4.9.0-rc4+ hardkernel#47 Not tainted ------------------------------- ./include/linux/kvm_host.h:536 suspicious rcu_dereference_check() usage! stack backtrace: CPU: 1 PID: 6679 Comm: syz-executor Not tainted 4.9.0-rc4+ hardkernel#47 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 ffff880039e2f6d0 ffffffff81c2e46b ffff88003e3a5b40 0000000000000000 0000000000000001 ffffffff83215600 ffff880039e2f700 ffffffff81334ea9 ffffc9000730b000 0000000000000004 ffff88003c4f8420 ffff88003d3f8000 Call Trace: [< inline >] __dump_stack lib/dump_stack.c:15 [<ffffffff81c2e46b>] dump_stack+0xb3/0x118 lib/dump_stack.c:51 [<ffffffff81334ea9>] lockdep_rcu_suspicious+0x139/0x180 kernel/locking/lockdep.c:4445 [< inline >] __kvm_memslots include/linux/kvm_host.h:534 [< inline >] kvm_memslots include/linux/kvm_host.h:541 [<ffffffff8105d6ae>] kvm_gfn_to_hva_cache_init+0xa1e/0xce0 virt/kvm/kvm_main.c:1941 [<ffffffff8112685d>] kvm_lapic_set_vapic_addr+0xed/0x140 arch/x86/kvm/lapic.c:2217 Reported-by: Dmitry Vyukov <[email protected]> Fixes: fda4e2e Cc: Andrew Honig <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Signed-off-by: Radim Krčmář <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent aea9d76 commit b689e86

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/x86/kvm/x86.c

+3
Original file line numberDiff line numberDiff line change
@@ -3317,14 +3317,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
33173317
};
33183318
case KVM_SET_VAPIC_ADDR: {
33193319
struct kvm_vapic_addr va;
3320+
int idx;
33203321

33213322
r = -EINVAL;
33223323
if (!lapic_in_kernel(vcpu))
33233324
goto out;
33243325
r = -EFAULT;
33253326
if (copy_from_user(&va, argp, sizeof va))
33263327
goto out;
3328+
idx = srcu_read_lock(&vcpu->kvm->srcu);
33273329
r = kvm_lapic_set_vapic_addr(vcpu, va.vapic_addr);
3330+
srcu_read_unlock(&vcpu->kvm->srcu, idx);
33283331
break;
33293332
}
33303333
case KVM_X86_SETUP_MCE: {

0 commit comments

Comments
 (0)