diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 23:18:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 23:18:59 +0300 |
| commit | fc13ca191ee2ae5f379e2933cdff523c3b4fffc9 (patch) | |
| tree | b62beebc6b8160c57c241c6288cdfe35f9c5e122 /arch/x86/kvm/ioapic.h | |
| parent | 39c1573748166b348117d6bf161ceffce90e734f (diff) | |
| parent | df492896e6dfb44fd1154f5402428d8e52705081 (diff) | |
| download | linux-fc13ca191ee2ae5f379e2933cdff523c3b4fffc9.tar.xz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Radim Krčmář:
"Four fixes for bugs found by syzkaller on x86, all for stable"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: check for pic and ioapic presence before use
KVM: x86: fix out-of-bounds accesses of rtc_eoi map
KVM: x86: drop error recovery in em_jmp_far and em_ret_far
KVM: x86: fix out-of-bounds access in lapic
Diffstat (limited to 'arch/x86/kvm/ioapic.h')
| -rw-r--r-- | arch/x86/kvm/ioapic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index 7d2692a49657..1cc6e54436db 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -42,13 +42,13 @@ struct kvm_vcpu; struct dest_map { /* vcpu bitmap where IRQ has been sent */ - DECLARE_BITMAP(map, KVM_MAX_VCPUS); + DECLARE_BITMAP(map, KVM_MAX_VCPU_ID); /* * Vector sent to a given vcpu, only valid when * the vcpu's bit in map is set */ - u8 vectors[KVM_MAX_VCPUS]; + u8 vectors[KVM_MAX_VCPU_ID]; }; |