5a0f88db96
Fix CVE-2013-4148 (bnc#864812), CVE-2013-4149 (bnc#864649), CVE-2013-4150 (bnc#864650), CVE-2013-4151 (bnc#864653), CVE-2013-4526 (bnc#864671), CVE-2013-4527 (bnc#864673), CVE-2013-4529 (bnc#864678), CVE-2013-4530 (bnc#864682), CVE-2013-4531 (bnc#864796), CVE-2013-4533 (bnc#864655), CVE-2013-4534 (bnc#864811), CVE-2013-4535 / CVE-2013-4536 (bnc#864665), CVE-2013-4537 (bnc#864391), CVE-2013-4538 (bnc#864769), CVE-2013-4539 (bnc#864805), CVE-2013-4540 (bnc#864801), CVE-2013-4541 (bnc#864802), CVE-2013-4542 (bnc#864804), CVE-2013-6399 (bnc#864814), CVE-2014-0182 (bnc#874788) OBS-URL: https://build.opensuse.org/request/show/235280 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=211
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 9ec43fe48680cf5917eb3d41ad85201d4137871f Mon Sep 17 00:00:00 2001
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Mon, 28 Apr 2014 16:08:14 +0300
|
|
Subject: [PATCH] ssi-sd: fix buffer overrun on invalid state load
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2013-4537
|
|
|
|
s->arglen is taken from wire and used as idx
|
|
in ssi_sd_transfer().
|
|
|
|
Validate it before access.
|
|
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit a9c380db3b8c6af19546a68145c8d1438a09c92b)
|
|
[AF: BNC#864391]
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
hw/sd/ssi-sd.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
|
|
index 3273c8a..b012e57 100644
|
|
--- a/hw/sd/ssi-sd.c
|
|
+++ b/hw/sd/ssi-sd.c
|
|
@@ -230,8 +230,17 @@ static int ssi_sd_load(QEMUFile *f, void *opaque, int version_id)
|
|
for (i = 0; i < 5; i++)
|
|
s->response[i] = qemu_get_be32(f);
|
|
s->arglen = qemu_get_be32(f);
|
|
+ if (s->mode == SSI_SD_CMDARG &&
|
|
+ (s->arglen < 0 || s->arglen >= ARRAY_SIZE(s->cmdarg))) {
|
|
+ return -EINVAL;
|
|
+ }
|
|
s->response_pos = qemu_get_be32(f);
|
|
s->stopping = qemu_get_be32(f);
|
|
+ if (s->mode == SSI_SD_RESPONSE &&
|
|
+ (s->response_pos < 0 || s->response_pos >= ARRAY_SIZE(s->response) ||
|
|
+ (!s->stopping && s->arglen > ARRAY_SIZE(s->response)))) {
|
|
+ return -EINVAL;
|
|
+ }
|
|
|
|
ss->cs = qemu_get_be32(f);
|
|
|