diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-04-28 16:08:14 +0300 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-06-26 14:19:48 -0500 |
| commit | 45edb0ca7a8a527ecf9fb36180df4b9664a9227c (patch) | |
| tree | 9166e788c7d3deb4314326b04f5b2b0915f35923 /hw | |
| parent | d92a7683e8cc4d3daab1ae9197f9311a72c9d1e6 (diff) | |
| download | qemu-45edb0ca7a8a527ecf9fb36180df4b9664a9227c.zip qemu-45edb0ca7a8a527ecf9fb36180df4b9664a9227c.tar.gz qemu-45edb0ca7a8a527ecf9fb36180df4b9664a9227c.tar.bz2 | |
ssi-sd: fix buffer overrun on invalid state load
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)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/sd/ssi-sd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 1bb56c4..90ff07b 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); |