|
 |
9ae3a8 |
From 546f9e97d193307a2ca26c11bf1162d07cc2d31f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 14 May 2014 08:52:59 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 24/31] hw/pci/pcie_aer.c: fix buffer overruns on invalid state load
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1400057538-6975-6-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 58872
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.1 5/5] hw/pci/pcie_aer.c: fix buffer overruns on invalid state load
|
|
|
9ae3a8 |
Bugzilla: 1095716
|
|
|
9ae3a8 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
4) CVE-2013-4529
|
|
|
9ae3a8 |
hw/pci/pcie_aer.c pcie aer log can overrun the buffer if log_num is
|
|
|
9ae3a8 |
too large
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
There are two issues in this file:
|
|
|
9ae3a8 |
1. log_max from remote can be larger than on local
|
|
|
9ae3a8 |
then buffer will overrun with data coming from state file.
|
|
|
9ae3a8 |
2. log_num can be larger then we get data corruption
|
|
|
9ae3a8 |
again with an overflow but not adversary controlled.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Fix both issues.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reported-by: Anthony Liguori <anthony@codemonkey.ws>
|
|
|
9ae3a8 |
Reported-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 5f691ff91d323b6f97c6600405a7f9dc115a0ad1)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Tested: lightly on developer's box
|
|
|
9ae3a8 |
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7452039
|
|
|
9ae3a8 |
Bugzilla:1095716
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/pci/pcie_aer.c | 10 +++++++++-
|
|
|
9ae3a8 |
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/pci/pcie_aer.c | 10 +++++++++-
|
|
|
9ae3a8 |
1 files changed, 9 insertions(+), 1 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
|
|
|
9ae3a8 |
index 1ce72ce..ab5c9c6 100644
|
|
|
9ae3a8 |
--- a/hw/pci/pcie_aer.c
|
|
|
9ae3a8 |
+++ b/hw/pci/pcie_aer.c
|
|
|
9ae3a8 |
@@ -795,6 +795,13 @@ static const VMStateDescription vmstate_pcie_aer_err = {
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static bool pcie_aer_state_log_num_valid(void *opaque, int version_id)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ PCIEAERLog *s = opaque;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ return s->log_num <= s->log_max;
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
const VMStateDescription vmstate_pcie_aer_log = {
|
|
|
9ae3a8 |
.name = "PCIE_AER_ERROR_LOG",
|
|
|
9ae3a8 |
.version_id = 1,
|
|
|
9ae3a8 |
@@ -802,7 +809,8 @@ const VMStateDescription vmstate_pcie_aer_log = {
|
|
|
9ae3a8 |
.minimum_version_id_old = 1,
|
|
|
9ae3a8 |
.fields = (VMStateField[]) {
|
|
|
9ae3a8 |
VMSTATE_UINT16(log_num, PCIEAERLog),
|
|
|
9ae3a8 |
- VMSTATE_UINT16(log_max, PCIEAERLog),
|
|
|
9ae3a8 |
+ VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog),
|
|
|
9ae3a8 |
+ VMSTATE_VALIDATE("log_num <= log_max", pcie_aer_state_log_num_valid),
|
|
|
9ae3a8 |
VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num,
|
|
|
9ae3a8 |
vmstate_pcie_aer_err, PCIEAERErr),
|
|
|
9ae3a8 |
VMSTATE_END_OF_LIST()
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|