diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-04-28 16:08:14 +0300 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2014-05-05 22:15:03 +0200 |
| commit | a9c380db3b8c6af19546a68145c8d1438a09c92b (patch) | |
| tree | f3f2b25a8591bbc8e9cfcdfdfccc291b88f6ffa2 | |
| parent | 767adce2d9cd397de3418caa16be35ea18d56f22 (diff) | |
| download | focaccia-qemu-a9c380db3b8c6af19546a68145c8d1438a09c92b.tar.gz focaccia-qemu-a9c380db3b8c6af19546a68145c8d1438a09c92b.zip | |
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>
| -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 3273c8a31f..b012e57f64 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); |