[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE][PATCH 05/10] scsi-disk: fix buffer overflow
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE][PATCH 05/10] scsi-disk: fix buffer overflow |
Date: |
Fri, 9 Apr 2010 11:46:23 +0200 |
From: Gerd Hoffmann <address@hidden>
In case s->version is shorter than 4 bytes we overflow the memcpy src
buffer. Fix it by clearing the target buffer, then copy only the
amount of bytes we actually have.
Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from 314b1811c15f4e982e4667d9b845aee4b5a63d91)
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/scsi-disk.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index b34fbaa..a792012 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -434,7 +434,9 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req,
uint8_t *outbuf)
memcpy(&outbuf[16], "QEMU HARDDISK ", 16);
}
memcpy(&outbuf[8], "QEMU ", 8);
- memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION, 4);
+ memset(&outbuf[32], 0, 4);
+ memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION,
+ MIN(4, strlen(s->version ? s->version : QEMU_VERSION)));
/* Identify device as SCSI-3 rev 1.
Some later commands are also implemented. */
outbuf[2] = 3;
--
1.6.6.1
- [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 01/10] json-parser: Fix segfault on malformed input, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 02/10] block: avoid creating too large iovecs in multiwrite_merge, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 05/10] scsi-disk: fix buffer overflow,
Kevin Wolf <=
- [Qemu-devel] [STABLE][PATCH 06/10] block: Fix multiwrite error handling, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 03/10] qcow2: Factor next_refcount_table_size out, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 04/10] qcow2: Rewrite alloc_refcount_block/grow_refcount_table, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight list after error, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 09/10] qcow2: Don't ignore immediate read/write failures, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 08/10] block: Fix multiwrite memory leak in error case, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 07/10] block: Fix error code in multiwrite for immediate failures, Kevin Wolf, 2010/04/09
- Re: [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4, Aurelien Jarno, 2010/04/09