[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 30/31] block/export: fix vhost-user-blk get_config() informatio
From: |
Michael S. Tsirkin |
Subject: |
[PULL v3 30/31] block/export: fix vhost-user-blk get_config() information leak |
Date: |
Wed, 4 Nov 2020 13:42:41 -0500 |
From: Stefan Hajnoczi <stefanha@redhat.com>
Refuse get_config() requests in excess of sizeof(struct virtio_blk_config).
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201027173528.213464-5-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
block/export/vhost-user-blk-server.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/export/vhost-user-blk-server.c
b/block/export/vhost-user-blk-server.c
index 33cc0818b8..62672d1cb9 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -266,6 +266,9 @@ vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint32_t
len)
{
VuServer *server = container_of(vu_dev, VuServer, vu_dev);
VuBlkExport *vexp = container_of(server, VuBlkExport, vu_server);
+
+ g_return_val_if_fail(len <= sizeof(struct virtio_blk_config), -1);
+
memcpy(config, &vexp->blkcfg, len);
return 0;
}
--
MST
- [PULL v3 20/31] vfio: Set IOMMU page size as per host supported page size, (continued)
- [PULL v3 20/31] vfio: Set IOMMU page size as per host supported page size, Michael S. Tsirkin, 2020/11/04
- [PULL v3 21/31] virtio-iommu: Set supported page size mask, Michael S. Tsirkin, 2020/11/04
- [PULL v3 22/31] vfio: Don't issue full 2^64 unmap, Michael S. Tsirkin, 2020/11/04
- [PULL v3 23/31] vhost-vdpa: Add qemu_close in vhost_vdpa_cleanup, Michael S. Tsirkin, 2020/11/04
- [PULL v3 24/31] net: Add vhost-vdpa in show_netdevs(), Michael S. Tsirkin, 2020/11/04
- [PULL v3 25/31] Revert "vhost-blk: set features before setting inflight feature", Michael S. Tsirkin, 2020/11/04
- [PULL v3 26/31] vhost-blk: set features before setting inflight feature, Michael S. Tsirkin, 2020/11/04
- [PULL v3 27/31] libvhost-user: follow QEMU comment style, Michael S. Tsirkin, 2020/11/04
- [PULL v3 28/31] configure: introduce --enable-vhost-user-blk-server, Michael S. Tsirkin, 2020/11/04
- [PULL v3 29/31] block/export: make vhost-user-blk config space little-endian, Michael S. Tsirkin, 2020/11/04
- [PULL v3 30/31] block/export: fix vhost-user-blk get_config() information leak,
Michael S. Tsirkin <=
- [PULL v3 31/31] contrib/vhost-user-blk: fix get_config() information leak, Michael S. Tsirkin, 2020/11/04
- [PULL v3 18/31] virtio-iommu: Add notify_flag_changed() memory region callback, Michael S. Tsirkin, 2020/11/04
- [PULL v3 10/31] hw/acpi : add spaces around operator, Michael S. Tsirkin, 2020/11/04
- Re: [PULL v3 00/31] pc,pci,vhost,virtio: fixes, Peter Maydell, 2020/11/05