From: Zhen Lei <thunder.leizhen@huawei.com>
Date: Sat, 15 May 2021 02:04:58 +0000 (+0800)
Subject: vfio/pci: Fix error return code in vfio_ecap_init()
X-Git-Tag: v5.13-rc5~14^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1ce2c79156d3baf0830990ab06d296477b93c26;p=thirdparty%2Fkernel%2Flinux.git

vfio/pci: Fix error return code in vfio_ecap_init()

The error code returned from vfio_ext_cap_len() is stored in 'len', not
in 'ret'.

Fixes: 89e1f7d4c66d ("vfio: Add PCI device driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Message-Id: <20210515020458.6771-1-thunder.leizhen@huawei.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index d57f037f65b85..70e28efbc51f8 100644
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -1581,7 +1581,7 @@ static int vfio_ecap_init(struct vfio_pci_device *vdev)
 			if (len == 0xFF) {
 				len = vfio_ext_cap_len(vdev, ecap, epos);
 				if (len < 0)
-					return ret;
+					return len;
 			}
 		}