ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/blkio: close the fd when blkio_connect() fails 

libblkio drivers take ownership of `fd` only after a successful
blkio_connect(), so if it fails, we are still the owners.

Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for virtio-blk")
Suggested-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Message-id: 20230803082825.25293-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefano Garzarella 2023-08-03 10:28:24 +02:00 committed by Stefan Hajnoczi
parent 9ba37026fc
commit 0b054b4c82
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/blkio.c
View File

@ -678,7 +678,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
const char *path = qdict_get_try_str(options, "path"); const char *path = qdict_get_try_str(options, "path");
BDRVBlkioState *s = bs->opaque; BDRVBlkioState *s = bs->opaque;
bool fd_supported = false; bool fd_supported = false;
int fd, ret; int fd = -1, ret;
if (!path) { if (!path) {
error_setg(errp, "missing 'path' option"); error_setg(errp, "missing 'path' option");
@ -719,6 +719,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
if (ret < 0) { if (ret < 0) {
fd_supported = false; fd_supported = false;
qemu_close(fd); qemu_close(fd);
fd = -1;
} }
} }
} }
@ -733,14 +734,18 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
} }
ret = blkio_connect(s->blkio); ret = blkio_connect(s->blkio);
if (ret < 0 && fd >= 0) {
/* Failed to give the FD to libblkio, close it */
qemu_close(fd);
fd = -1;
}
/* /*
* If the libblkio driver doesn't support the `fd` property, blkio_connect() * If the libblkio driver doesn't support the `fd` property, blkio_connect()
* will fail with -EINVAL. So let's try calling blkio_connect() again by * will fail with -EINVAL. So let's try calling blkio_connect() again by
* directly setting `path`. * directly setting `path`.
*/ */
if (fd_supported && ret == -EINVAL) { if (fd_supported && ret == -EINVAL) {
qemu_close(fd);
/* /*
* We need to clear the `fd` property we set previously by setting * We need to clear the `fd` property we set previously by setting
* it to -1. * it to -1.