summaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorAndy Honig <ahonig@google.com>2013-02-20 14:49:16 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-25 21:19:55 -0700
commitf56d137aa68f8edadac247aa48b335f2776954ff (patch)
tree7972505b31b9bcdd778e652ad5632167cd22998d /virt
parentf6dfc740c1d8f6133d2f53c1074770c13d040364 (diff)
downloadlinux-3.10-f56d137aa68f8edadac247aa48b335f2776954ff.tar.gz
linux-3.10-f56d137aa68f8edadac247aa48b335f2776954ff.tar.bz2
linux-3.10-f56d137aa68f8edadac247aa48b335f2776954ff.zip
KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798)
commit a2c118bfab8bc6b8bb213abfc35201e441693d55 upstream. If the guest specifies a IOAPIC_REG_SELECT with an invalid value and follows that with a read of the IOAPIC_REG_WINDOW KVM does not properly validate that request. ioapic_read_indirect contains an ASSERT(redir_index < IOAPIC_NUM_PINS), but the ASSERT has no effect in non-debug builds. In recent kernels this allows a guest to cause a kernel oops by reading invalid memory. In older kernels (pre-3.3) this allows a guest to read from large ranges of host memory. Tested: tested against apic unit tests. Signed-off-by: Andrew Honig <ahonig@google.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/ioapic.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index dcaf272c26c..9f477f67163 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -73,9 +73,12 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
u32 redir_index = (ioapic->ioregsel - 0x10) >> 1;
u64 redir_content;
- ASSERT(redir_index < IOAPIC_NUM_PINS);
+ if (redir_index < IOAPIC_NUM_PINS)
+ redir_content =
+ ioapic->redirtbl[redir_index].bits;
+ else
+ redir_content = ~0ULL;
- redir_content = ioapic->redirtbl[redir_index].bits;
result = (ioapic->ioregsel & 0x1) ?
(redir_content >> 32) & 0xffffffff :
redir_content & 0xffffffff;