From: "Benoît Canet" <benoit.canet@irqsave.net>
To: Max Reitz <mreitz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 1/4] qcow2: Fix leak of QemuOpts in qcow2_open()
Date: Thu, 21 Aug 2014 19:54:04 +0200 [thread overview]
Message-ID: <20140821175403.GD26320@irqsave.net> (raw)
In-Reply-To: <1408557576-14574-2-git-send-email-mreitz@redhat.com>
The Wednesday 20 Aug 2014 à 19:59:33 (+0200), Max Reitz wrote :
> Currently, the QemuOpts object opts is leaked if anything fails from its
> creation up to and including the image repair block. Fix this by freeing
> that object in the fail path.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> block/qcow2.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index f9e045f..c64d611 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -535,7 +535,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
> unsigned int len, i;
> int ret = 0;
> QCowHeader header;
> - QemuOpts *opts;
> + QemuOpts *opts = NULL;
> Error *local_err = NULL;
> uint64_t ext_end;
> uint64_t l1_vm_state_index;
> @@ -932,7 +932,6 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
> error_setg(errp, "Unsupported value '%s' for qcow2 option "
> "'overlap-check'. Allowed are either of the following: "
> "none, constant, cached, all", opt_overlap_check);
> - qemu_opts_del(opts);
> ret = -EINVAL;
> goto fail;
> }
> @@ -947,6 +946,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
> }
>
> qemu_opts_del(opts);
> + opts = NULL;
>
> if (s->use_lazy_refcounts && s->qcow_version < 3) {
> error_setg(errp, "Lazy refcounts require a qcow2 image with at least "
> @@ -964,6 +964,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
> return ret;
>
> fail:
> + qemu_opts_del(opts);
> g_free(s->unknown_header_fields);
> cleanup_unknown_header_ext(bs);
> qcow2_free_snapshots(bs);
> --
> 2.0.4
>
>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
next prev parent reply other threads:[~2014-08-21 17:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 17:59 [Qemu-devel] [PATCH 0/4] qapi/block-core: Add "new" qcow2 options Max Reitz
2014-08-20 17:59 ` [Qemu-devel] [PATCH 1/4] qcow2: Fix leak of QemuOpts in qcow2_open() Max Reitz
2014-08-20 19:10 ` Eric Blake
2014-08-21 17:54 ` Benoît Canet [this message]
2014-08-20 17:59 ` [Qemu-devel] [PATCH 2/4] qapi: Allow enums in anonymous unions Max Reitz
2014-08-20 19:15 ` Eric Blake
2014-08-20 17:59 ` [Qemu-devel] [PATCH 3/4] qcow2: Add overlap-check.template option Max Reitz
2014-08-20 19:22 ` Eric Blake
2014-08-20 19:27 ` Eric Blake
2014-08-20 19:30 ` Max Reitz
2014-08-20 17:59 ` [Qemu-devel] [PATCH 4/4] qapi/block-core: Add "new" qcow2 options Max Reitz
2014-08-20 19:36 ` Eric Blake
2014-08-20 19:38 ` Max Reitz
2014-08-20 19:45 ` Eric Blake
2014-09-17 13:12 ` [Qemu-devel] [PATCH 0/4] " Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140821175403.GD26320@irqsave.net \
--to=benoit.canet@irqsave.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.