From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 14/18] block: Fix memory leaks in bdrv_co_do_pwritev()
Date: Sun, 9 Feb 2014 09:46:26 +0100 [thread overview]
Message-ID: <1391935590-12264-15-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1391935590-12264-1-git-send-email-kwolf@redhat.com>
The error path for a failure in one of the two bdrv_aligned_preadv()
calls leaked head_buf or tail_buf, respectively. This fixes the memory
leak.
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
block.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index ac0ccac..c1d1f74 100644
--- a/block.c
+++ b/block.c
@@ -3279,9 +3279,9 @@ fail:
if (use_local_qiov) {
qemu_iovec_destroy(&local_qiov);
- qemu_vfree(head_buf);
- qemu_vfree(tail_buf);
}
+ qemu_vfree(head_buf);
+ qemu_vfree(tail_buf);
return ret;
}
--
1.8.1.4
next prev parent reply other threads:[~2014-02-09 8:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-09 8:46 [Qemu-devel] [PULL 00/18] Block patches Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 01/18] qemu-iotest: Make 077 raw-only Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 02/18] block: add native support for NFS Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 03/18] qemu-iotests: change _supported_proto to file for various tests Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 04/18] qemu-iotests: blacklist test 020 for NFS protocol Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 05/18] qemu-iotests: enable test 016 and 025 to work with " Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 06/18] qemu-iotests: enable support for " Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 07/18] block: Fail gracefully with missing filename Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 08/18] block/iscsi: always fill bs->bl.opt_transfer_length Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 09/18] qcow2: remove n_start and n_end of qcow2_alloc_cluster_offset() Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 10/18] qcow2: fix offset overflow in qcow2_alloc_clusters_at() Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 11/18] qcow2: check for NULL l2meta Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 12/18] qemu-iotests: add test for qcow2 preallocation with different cluster sizes Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 13/18] raw: Fix BlockLimits passthrough Kevin Wolf
2014-02-09 8:46 ` Kevin Wolf [this message]
2014-02-09 8:46 ` [Qemu-devel] [PULL 15/18] block: bdrv_aligned_pwritev: Assert overlap range Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 16/18] block: Don't call ROUND_UP with negative values Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 17/18] blkdebug: Don't leak bs->file on failure Kevin Wolf
2014-02-09 8:46 ` [Qemu-devel] [PULL 18/18] block: Fix 32 bit truncation in mark_request_serialising() Kevin Wolf
2014-02-12 17:52 ` [Qemu-devel] [PULL 00/18] Block patches Peter Maydell
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=1391935590-12264-15-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--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).