Re: [Qemu-devel] [PATCH v3 09/12] VMDK: open/read/write for monolithicFlat image

[Stefan Hajnoczi]

On Mon, Jun 27, 2011 at 4:48 AM, Fam Zheng <address@hidden> wrote:
> Parse vmdk decriptor file and open mono flat image.
> @@ -598,6 +600,154 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, int 
> flags)
>     return ret;
>  }
>
> +/* find an option value out of descriptor file */
> +static int vmdk_parse_description(const char *desc, const char *opt_name,
> +        char *buf, int buf_size)
> +{
> +    char *opt_pos = strstr(desc, opt_name);
> +    int r;
> +    const char *end = desc + strlen(desc);
> +
> +    if (!opt_pos) {
> +        return -1;
> +    }
> +    opt_pos += strlen(opt_name) + 2;
> +    if (opt_pos >= end) {
> +        return -1;
> +    }
> +    r = sscanf(opt_pos, "%[^\"]s", buf);
> +    return r <= 0;
> +}

This is still unsafe.  Please see my comments on the previous version
of this patch.

> +static int vmdk_open_desc_file(BlockDriverState *bs, int flags)
> +{
> +    int ret;
> +    char buf[2048];
> +    char ct[128];
> +    BDRVVmdkState *s = bs->opaque;
> +
> +    ret = bdrv_pread(bs->file, 0, buf, sizeof(buf));
> +    ret = bdrv_pread(bs->file, 0, buf, sizeof(buf));

Merge error?  Only need to bdrv_pread() once :).

Stefan