On May 16, 2011, at 09:43, Lukas Czerner wrote:
> diff --git a/lib/ext2fs/qcow2.c b/lib/ext2fs/qcow2.c
> index 17eab38..9ac050b 100644
> --- a/lib/ext2fs/qcow2.c
> +++ b/lib/ext2fs/qcow2.c
> @@ -209,9 +209,10 @@ int qcow2_write_raw_image(int qcow2_fd, int raw_fd,
> }
>
> /* Resize the output image to the filesystem size */
> - if (lseek(raw_fd, img.image_size, SEEK_SET) < 0)
> + if (lseek(raw_fd, img.image_size - 1, SEEK_SET) < 0)
> return errno;
>
> + memset(copy_buf, 0, 1);
> size = write(raw_fd, copy_buf, 1);
> if (size != 1)
> return errno;
This should probably be part of the first patch. Probably memset() is overkill here, just "copy_buf[0] = 0;" is enough.
> diff --git a/misc/e2image.c b/misc/e2image.c
> index 6dc78d3..d749981 100644
> --- a/misc/e2image.c
> +++ b/misc/e2image.c
> @@ -1229,16 +1229,33 @@ static void install_image(char *device, char *image_fn, int type)
> exit (0);
> }
>
> +static struct ext2_qcow2_hdr *check_qcow2_image(int *fd, char *name)
> +{
> +
> +#ifdef HAVE_OPEN64
> + *fd = open64(name, O_RDONLY, 0600);
> +#else
> + *fd = open(name, O_RDONLY, 0600);
> +#endif
> + if (*fd < 0)
> + return NULL;
> +
> + return qcow2_read_header(*fd, name);
It probably makes sense to check the header here that it is not using AES encryption, and return an error (NULL?) if it is. I don't think there is a flag in the header if compression is used, since that is only marked in each block.
> + if (flags & IS_QCOW2_FLAG) {
> + ret = qcow2_write_raw_image(qcow2_fd, fd, header);
This also reminds me that qcow2_write_raw_image() should check the block numbers read from disk whether they point to zlib-compressed blocks, and return an error if they do, instead of just writing out the compressed data to disk. Otherwise, some users might accidentally try to "restore" the qcow2 image created by some other tool and corrupt their filesystem.
Cheers, Andreas
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
