From 43b30dec4d07aa81ff5f2dc3b0a064fa589fd3af Mon Sep 17 00:00:00 2001

From: "Michael S. Tsirkin" <mst@redhat.com>

Date: Thu, 3 Apr 2014 19:51:57 +0300

Subject: [PATCH] pxa2xx: avoid buffer overrun on incoming migration

CVE-2013-4533

s->rx_level is read from the wire and used to determine how many bytes

to subsequently read into s->rx_fifo[]. If s->rx_level exceeds the

length of s->rx_fifo[] the buffer can be overrun with arbitrary data

from the wire.

Fix this by validating rx_level against the size of s->rx_fifo.

Cc: Don Koch <dkoch@verizon.com>

Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Don Koch <dkoch@verizon.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>

(cherry picked from commit caa881abe0e01f9931125a0977ec33c5343e4aa7)

---

 hw/arm/pxa2xx.c | 8 ++++++--

 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c

index 0429148..e0cd847 100644

--- a/hw/arm/pxa2xx.c

+++ b/hw/arm/pxa2xx.c

@@ -732,7 +732,7 @@ static void pxa2xx_ssp_save(QEMUFile *f, void *opaque)

 static int pxa2xx_ssp_load(QEMUFile *f, void *opaque, int version_id)

 {

     PXA2xxSSPState *s = (PXA2xxSSPState *) opaque;

-    int i;

+    int i, v;

     s->enable = qemu_get_be32(f);

@@ -746,7 +746,11 @@ static int pxa2xx_ssp_load(QEMUFile *f, void *opaque, int version_id)

     qemu_get_8s(f, &s->ssrsa);

     qemu_get_8s(f, &s->ssacd);

-    s->rx_level = qemu_get_byte(f);

+    v = qemu_get_byte(f);

+    if (v < 0 || v > ARRAY_SIZE(s->rx_fifo)) {

+        return -EINVAL;

+    }

+    s->rx_level = v;

     s->rx_start = 0;

     for (i = 0; i < s->rx_level; i ++)

         s->rx_fifo[i] = qemu_get_byte(f);