diff options
author | Thanos Makatos <thanos.makatos@nutanix.com> | 2021-05-28 20:46:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-28 20:46:59 +0100 |
commit | d69581a45fa1c720cb796eb829259739c0ee2c2f (patch) | |
tree | 678ec15701102947c27201164c4d6c701b3cc40b | |
parent | 950a9847fee01cc80f749bf0ba2636a407c0e7c8 (diff) | |
download | libvfio-user-d69581a45fa1c720cb796eb829259739c0ee2c2f.zip libvfio-user-d69581a45fa1c720cb796eb829259739c0ee2c2f.tar.gz libvfio-user-d69581a45fa1c720cb796eb829259739c0ee2c2f.tar.bz2 |
don't return non-zero caps for zero-sized regions (#543)
Signed-off-by: Thanos Makatos <thanos.makatos@nutanix.com>
Reviewed-by: John Levon <john.levon@nutanix.com>
-rw-r--r-- | lib/libvfio-user.c | 8 | ||||
-rw-r--r-- | test/py/test_device_get_region_info_zero_size.py | 78 |
2 files changed, 83 insertions, 3 deletions
diff --git a/lib/libvfio-user.c b/lib/libvfio-user.c index 6be9a92..3963312 100644 --- a/lib/libvfio-user.c +++ b/lib/libvfio-user.c @@ -385,7 +385,7 @@ handle_device_get_region_info(vfu_ctx_t *vfu_ctx, vfu_msg_t *msg) struct vfio_region_info *in_info; struct vfio_region_info *out_info; vfu_reg_info_t *vfu_reg; - size_t caps_size; + size_t caps_size = 0; assert(vfu_ctx != NULL); assert(msg != NULL); @@ -404,8 +404,10 @@ handle_device_get_region_info(vfu_ctx_t *vfu_ctx, vfu_msg_t *msg) vfu_reg = &vfu_ctx->reg_info[in_info->index]; - caps_size = get_vfio_caps_size(in_info->index == VFU_PCI_DEV_MIGR_REGION_IDX, - vfu_reg); + if (vfu_reg->size > 0) { + caps_size = get_vfio_caps_size(in_info->index == VFU_PCI_DEV_MIGR_REGION_IDX, + vfu_reg); + } msg->out_size = MIN(sizeof(*out_info) + caps_size, in_info->argsz); msg->out_data = calloc(1, msg->out_size); diff --git a/test/py/test_device_get_region_info_zero_size.py b/test/py/test_device_get_region_info_zero_size.py new file mode 100644 index 0000000..c0965d3 --- /dev/null +++ b/test/py/test_device_get_region_info_zero_size.py @@ -0,0 +1,78 @@ +# +# Copyright (c) 2021 Nutanix Inc. All rights reserved. +# +# Author: Thanos Makatos <thanos.makatos@nutanix.com> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Nutanix nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +# DAMAGE. +# + +from libvfio_user import * +import errno +import tempfile +import os + +ctx = None +sock = None + +argsz = len(vfio_region_info()) + +def test_device_get_region_info_setup(): + global ctx, sock + + ctx = vfu_create_ctx(flags=LIBVFIO_USER_FLAG_ATTACH_NB) + assert ctx != None + + ret = vfu_realize_ctx(ctx) + assert ret == 0 + + sock = connect_client(ctx) + + +def test_device_get_region_info_zero_sized_region(): + """Tests that a zero-sized region has no caps.""" + + global sock + + for index in [VFU_PCI_DEV_BAR1_REGION_IDX, VFU_PCI_DEV_MIGR_REGION_IDX]: + payload = vfio_region_info(argsz=argsz, flags=0, + index=index, cap_offset=0, + size=0, offset=0) + + hdr = vfio_user_header(VFIO_USER_DEVICE_GET_REGION_INFO, size=len(payload)) + sock.send(hdr + payload) + vfu_run_ctx(ctx) + result = get_reply(sock) + + assert(len(result) == argsz) + + info, _ = vfio_region_info.pop_from_buffer(result) + + assert info.argsz == argsz + assert info.flags == 0 + assert info.index == index + assert info.cap_offset == 0 + assert info.size == 0 + assert info.offset == 0 + + vfu_destroy_ctx(ctx) |