From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org
Subject: [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path
Date: Fri, 11 Apr 2014 14:39:09 +0200 [thread overview]
Message-ID: <1397219952-26807-2-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1397219952-26807-1-git-send-email-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
block/bochs.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/bochs.c b/block/bochs.c
index 826ec12..50b84a9 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -150,11 +150,13 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
s->extent_size = le32_to_cpu(bochs.extent);
if (s->extent_size == 0) {
error_setg(errp, "Extent size may not be zero");
- return -EINVAL;
+ ret = -EINVAL;
+ goto fail;
} else if (s->extent_size > 0x800000) {
error_setg(errp, "Extent size %" PRIu32 " is too large",
s->extent_size);
- return -EINVAL;
+ ret = -EINVAL;
+ goto fail;
}
if (s->catalog_size < bs->total_sectors / s->extent_size) {
--
1.8.3.1
next prev parent reply other threads:[~2014-04-11 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-11 12:39 [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 Kevin Wolf
2014-04-11 12:39 ` Kevin Wolf [this message]
2014-04-11 12:39 ` [Qemu-devel] [PULL 2/4] bochs: Fix catalog size check Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 3/4] iscsi: Remember to set ret for iscsi_open in error case Kevin Wolf
2014-04-11 12:39 ` [Qemu-devel] [PULL 4/4] block-commit: speed is an optional parameter Kevin Wolf
2014-04-11 13:25 ` [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3 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=1397219952-26807-2-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--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).