qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: aurelien@aurel32.net
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [STABLE][PATCH 01/14] vmdk: fix double free
Date: Wed, 14 Jul 2010 13:24:00 +0200	[thread overview]
Message-ID: <1279106653-24351-2-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1279106653-24351-1-git-send-email-kwolf@redhat.com>

fail_gd error case would also free rgd_buf that was already freed

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit a161329b61106ab093aab6d3227ac85e0b8251a9)

Conflicts:

	block/vmdk.c

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vmdk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index 4e48622..765e95a 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -285,7 +285,6 @@ static int vmdk_snapshot_create(const char *filename, const char *backing_file)
         goto fail_rgd;
     if (write(snp_fd, rgd_buf, gd_size) == -1)
         goto fail_rgd;
-    qemu_free(rgd_buf);
 
     /* write GD */
     gd_buf = qemu_malloc(gd_size);
@@ -298,6 +297,7 @@ static int vmdk_snapshot_create(const char *filename, const char *backing_file)
     if (write(snp_fd, gd_buf, gd_size) == -1)
         goto fail_gd;
     qemu_free(gd_buf);
+    qemu_free(rgd_buf);
 
     close(p_fd);
     close(snp_fd);
-- 
1.7.1.1

  reply	other threads:[~2010-07-14 11:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-14 11:23 [Qemu-devel] [STABLE][PULL 00/14] Block patches for 0.12.5 Kevin Wolf
2010-07-14 11:24 ` Kevin Wolf [this message]
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 02/14] qcow2: Fix creation of large images Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 03/14] vmdk: Fix COW Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 04/14] qcow2: Remove abort on free_clusters failure Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 05/14] block/vpc: Fix conversion from size to disk geometry Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 06/14] block/vdi: Fix image opening and creation for odd disk sizes Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 07/14] qcow2: Restore L1 entry on l2_allocate failure Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 08/14] block: Add bdrv_(p)write_sync Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 09/14] qcow: Use bdrv_(p)write_sync for metadata writes Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 10/14] qcow2: " Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 11/14] vmdk: " Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 12/14] vpc: " Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 13/14] block: Fix early failure in multiwrite Kevin Wolf
2010-07-14 11:24 ` [Qemu-devel] [STABLE][PATCH 14/14] block: Handle multiwrite errors only when all requests have completed Kevin Wolf
2010-07-14 12:50 ` [Qemu-devel] [STABLE][PULL 00/14] Block patches for 0.12.5 Aurelien Jarno

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=1279106653-24351-2-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=aurelien@aurel32.net \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).