56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
|
From d4e6359ea7c11e7ae6b8ff3c03394db96a2a6932 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
||
|
|
Date: Thu, 3 Apr 2014 19:51:35 +0300
|
||
|
|
Subject: [PATCH] pl022: fix buffer overun on invalid state load
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2013-4530
|
||
|
|
|
||
|
|
pl022.c did not bounds check tx_fifo_head and
|
||
|
|
rx_fifo_head after loading them from file and
|
||
|
|
before they are used to dereference array.
|
||
|
|
|
||
|
|
Reported-by: Michael S. Tsirkin <mst@redhat.com
|
||
|
|
Reported-by: Anthony Liguori <anthony@codemonkey.ws>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
(cherry picked from commit d8d0a0bc7e194300e53a346d25fe5724fd588387)
|
||
|
|
[AF: BNC#864682]
|
||
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||
|
|
---
|
||
|
|
hw/ssi/pl022.c | 14 ++++++++++++++
|
||
|
|
1 file changed, 14 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
|
||
|
|
index fd479ef..b19bc71 100644
|
||
|
|
--- a/hw/ssi/pl022.c
|
||
|
|
+++ b/hw/ssi/pl022.c
|
||
|
|
@@ -240,11 +240,25 @@ static const MemoryRegionOps pl022_ops = {
|
||
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
||
|
|
};
|
||
|
|
|
||
|
|
+static int pl022_post_load(void *opaque, int version_id)
|
||
|
|
+{
|
||
|
|
+ PL022State *s = opaque;
|
||
|
|
+
|
||
|
|
+ if (s->tx_fifo_head < 0 ||
|
||
|
|
+ s->tx_fifo_head >= ARRAY_SIZE(s->tx_fifo) ||
|
||
|
|
+ s->rx_fifo_head < 0 ||
|
||
|
|
+ s->rx_fifo_head >= ARRAY_SIZE(s->rx_fifo)) {
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static const VMStateDescription vmstate_pl022 = {
|
||
|
|
.name = "pl022_ssp",
|
||
|
|
.version_id = 1,
|
||
|
|
.minimum_version_id = 1,
|
||
|
|
.minimum_version_id_old = 1,
|
||
|
|
+ .post_load = pl022_post_load,
|
||
|
|
.fields = (VMStateField[]) {
|
||
|
|
VMSTATE_UINT32(cr0, PL022State),
|
||
|
|
VMSTATE_UINT32(cr1, PL022State),
|