From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 12/12] file-posix: Fix leaked fd in raw_open_common() error path
Date: Fri, 17 Jul 2020 14:55:10 +0200 [thread overview]
Message-ID: <20200717125510.238374-13-kwolf@redhat.com> (raw)
In-Reply-To: <20200717125510.238374-1-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200717105426.51134-4-kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-posix.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/file-posix.c b/block/file-posix.c
index 996e45ab95..8cc39a1ef6 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -773,6 +773,9 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
}
ret = 0;
fail:
+ if (ret < 0 && s->fd != -1) {
+ qemu_close(s->fd);
+ }
if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) {
unlink(filename);
}
--
2.25.4
next prev parent reply other threads:[~2020-07-17 13:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 12:54 [PULL 00/12] Block layer patches for 5.1.0-rc1 Kevin Wolf
2020-07-17 12:54 ` [PULL 01/12] vvfat: set status to odd fixes Kevin Wolf
2020-07-17 12:55 ` [PULL 02/12] Remove VXHS block device Kevin Wolf
2020-07-17 12:55 ` [PULL 03/12] qemu-img resize: Require --shrink for shrinking all image formats Kevin Wolf
2020-07-17 12:55 ` [PULL 04/12] crypto: use a stronger private key for tests Kevin Wolf
2020-07-17 12:55 ` [PULL 05/12] iotests/030: Reduce job speed to make race less likely Kevin Wolf
2020-08-03 12:40 ` Peter Maydell
2020-07-17 12:55 ` [PULL 06/12] nbd: make nbd_export_close_all() synchronous Kevin Wolf
2020-07-17 12:55 ` [PULL 07/12] iotests: test shutdown when bitmap is exported through NBD Kevin Wolf
2020-07-17 12:55 ` [PULL 08/12] block: Require aligned image size to avoid assertion failure Kevin Wolf
2020-07-17 12:55 ` [PULL 09/12] file-posix: Allow byte-aligned O_DIRECT with NFS Kevin Wolf
2020-07-17 12:55 ` [PULL 10/12] file-posix: Move check_hdev_writable() up Kevin Wolf
2020-07-17 12:55 ` [PULL 11/12] file-posix: Fix check_hdev_writable() with auto-read-only Kevin Wolf
2020-07-17 12:55 ` Kevin Wolf [this message]
2020-07-18 16:26 ` [PULL 00/12] Block layer patches for 5.1.0-rc1 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=20200717125510.238374-13-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.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).