diff options
author | Stefano Garzarella <sgarzare@redhat.com> | 2023-07-26 09:48:07 +0200 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2023-07-26 11:29:39 -0400 |
commit | a5942c177b7bcc1357e496b7d68668befcfc2bb9 (patch) | |
tree | 15752b05bda8f66da2526dd31d5f74838b9ae1e8 /block | |
parent | 9359c459889fce1804c4e1b2a2ff8f182b4a9ae8 (diff) | |
download | qemu-a5942c177b7bcc1357e496b7d68668befcfc2bb9.zip qemu-a5942c177b7bcc1357e496b7d68668befcfc2bb9.tar.gz qemu-a5942c177b7bcc1357e496b7d68668befcfc2bb9.tar.bz2 |
block/blkio: do not use open flags in qemu_open()
qemu_open() in blkio_virtio_blk_common_open() is used to open the
character device (e.g. /dev/vhost-vdpa-0 or /dev/vfio/vfio) or in
the future eventually the unix socket.
In all these cases we cannot open the path in read-only mode,
when the `read-only` option of blockdev is on, because the exchange
of IOCTL commands for example will fail.
In order to open the device read-only, we have to use the `read-only`
property of the libblkio driver as we already do in blkio_file_open().
Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for virtio-blk")
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2225439
Reported-by: Qing Wang <qinwang@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230726074807.14041-1-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/blkio.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/block/blkio.c b/block/blkio.c index bc1fac4..7eb1b94 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -686,15 +686,18 @@ static int blkio_virtio_blk_common_open(BlockDriverState *bs, * layer through the "/dev/fdset/N" special path. */ if (fd_supported) { - int open_flags; - - if (flags & BDRV_O_RDWR) { - open_flags = O_RDWR; - } else { - open_flags = O_RDONLY; - } - - fd = qemu_open(path, open_flags, errp); + /* + * `path` can contain the path of a character device + * (e.g. /dev/vhost-vdpa-0 or /dev/vfio/vfio) or a unix socket. + * + * So, we should always open it with O_RDWR flag, also if BDRV_O_RDWR + * is not set in the open flags, because the exchange of IOCTL commands + * for example will fail. + * + * In order to open the device read-only, we are using the `read-only` + * property of the libblkio driver in blkio_file_open(). + */ + fd = qemu_open(path, O_RDWR, errp); if (fd < 0) { return -EINVAL; } |