[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 4/6] vmdk: Check descriptor file length when
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH v3 4/6] vmdk: Check descriptor file length when reading it |
Date: |
Thu, 4 Dec 2014 07:13:08 +0800 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Wed, 12/03 15:17, Max Reitz wrote:
> On 2014-12-03 at 11:28, Fam Zheng wrote:
> >Since a too small file cannot be a valid VMDK image, and also since the
> >buffer's first 4 bytes will be unconditionally examined by
> >vmdk_open_sparse, let's error out the small file case to be clear.
> >
> >Signed-off-by: Fam Zheng <address@hidden>
> >Reviewed-by: Markus Armbruster <address@hidden>
> >---
> > block/vmdk.c | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> >diff --git a/block/vmdk.c b/block/vmdk.c
> >index 82257cd..045fd7a 100644
> >--- a/block/vmdk.c
> >+++ b/block/vmdk.c
> >@@ -557,6 +557,11 @@ static char *vmdk_read_desc(BlockDriverState *file,
> >uint64_t desc_offset,
> > return NULL;
> > }
> >+ if (size < 4) {
> >+ error_setg_errno(errp, -size, "File is too small, not a valid
> >image");
>
> 0 <= size < 4, strerror(0..-3) doesn't make a whole lot of sense. Should be
> simply error_setg() instead of error_setg_errno().
Yes, fixing.
Fam
- [Qemu-devel] [PATCH v3 0/6] vmdk: A few small fixes, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v3 1/6] vmdk: Use g_random_int to generate CID, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v3 2/6] vmdk: Fix comment to match code of extent lines, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v3 4/6] vmdk: Check descriptor file length when reading it, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v3 5/6] vmdk: Remove unnecessary initialization, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v3 3/6] vmdk: Clean up descriptor file reading, Fam Zheng, 2014/12/03
- [Qemu-devel] [PATCH v3 6/6] vmdk: Set errp on failures in vmdk_open_vmdk4, Fam Zheng, 2014/12/03