]> git.dujemihanovic.xyz Git - linux.git/commitdiff
vfio/pci: Restore zero affected bus reset devices warning
authorAlex Williamson <alex.williamson@redhat.com>
Thu, 16 May 2024 17:48:30 +0000 (11:48 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Fri, 17 May 2024 14:00:52 +0000 (08:00 -0600)
Yi notes relative to commit f6944d4a0b87 ("vfio/pci: Collect hot-reset
devices to local buffer") that we previously tested the resulting
device count with a WARN_ON, which was removed when we switched to
the in-loop user copy in commit b56b7aabcf3c ("vfio/pci: Copy hot-reset
device info to userspace in the devices loop").  Finding no devices in
the bus/slot would be an unexpected condition, so let's restore the
warning and trigger a -ERANGE error here as success with no devices
would be an unexpected result to userspace as well.

Suggested-by: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20240516174831.2257970-1-alex.williamson@redhat.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
drivers/vfio/pci/vfio_pci_core.c

index d8c95cc16be81975cfd0b918dee85fad48b1f5d5..80cae87fff36ee3f9010e5dd64b89b76578ffce1 100644 (file)
@@ -1281,6 +1281,9 @@ static int vfio_pci_ioctl_get_pci_hot_reset_info(
        if (ret)
                return ret;
 
+       if (WARN_ON(!count)) /* Should always be at least one */
+               return -ERANGE;
+
        if (count > (hdr.argsz - sizeof(hdr)) / sizeof(*devices)) {
                hdr.count = count;
                ret = -ENOSPC;