[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] vmdk: Fix possible segfaults
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 7/7] vmdk: Fix possible segfaults |
Date: |
Wed, 26 Oct 2011 14:31:22 +0200 |
Data we read from the disk isn't necessarily null terminated and may not
contain the string we're looking for. The code needs to be a bit more careful
here.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index fa0e8bd..8caaf0b 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -227,6 +227,7 @@ static uint32_t vmdk_read_cid(BlockDriverState *bs, int
parent)
cid_str_size = sizeof("CID");
}
+ desc[DESC_SIZE - 1] = '\0';
p_name = strstr(desc, cid_str);
if (p_name != NULL) {
p_name += cid_str_size;
@@ -243,13 +244,17 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t
cid)
BDRVVmdkState *s = bs->opaque;
int ret;
- memset(desc, 0, sizeof(desc));
ret = bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE);
if (ret < 0) {
return ret;
}
+ desc[DESC_SIZE - 1] = '\0';
tmp_str = strstr(desc, "parentCID");
+ if (tmp_str == NULL) {
+ return -EINVAL;
+ }
+
pstrcpy(tmp_desc, sizeof(tmp_desc), tmp_str);
p_name = strstr(desc, "CID");
if (p_name != NULL) {
--
1.7.6.4
- Re: [Qemu-devel] [PATCH 1/7] block: Remove dead code, (continued)
- [Qemu-devel] [PATCH 2/7] block: Fix bdrv_open use after free, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 4/7] ide: Fix off-by-one error in array index check, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 5/7] vmdk: Fix use of uninitialised value, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 6/7] vmdk: Improve error handling, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 7/7] vmdk: Fix possible segfaults,
Kevin Wolf <=
- [Qemu-devel] [PATCH 3/7] qcow: Fix bdrv_write_compressed error handling, Kevin Wolf, 2011/10/26