2021-12-22 11:21:03

by Hao Peng

Subject: [PATCH] virtio/virtio_pci_legacy_dev: ensure the correct return value

When pci_iomap return NULL, the return value is zero.

Signed-off-by: Peng Hao <[email protected]>
---
drivers/virtio/virtio_pci_legacy_dev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_pci_legacy_dev.c b/drivers/virtio/virtio_pci_legacy_dev.c
index 9b97680dd02b..677d1f68bc9b 100644
--- a/drivers/virtio/virtio_pci_legacy_dev.c
+++ b/drivers/virtio/virtio_pci_legacy_dev.c
@@ -45,8 +45,10 @@ int vp_legacy_probe(struct virtio_pci_legacy_device *ldev)
return rc;

ldev->ioaddr = pci_iomap(pci_dev, 0, 0);
- if (!ldev->ioaddr)
+ if (!ldev->ioaddr) {
+ rc = -EIO;
goto err_iomap;
+ }

ldev->isr = ldev->ioaddr + VIRTIO_PCI_ISR;

--
2.27.0

2021-12-23 05:59:04

by Jason Wang

Subject: Re: [PATCH] virtio/virtio_pci_legacy_dev: ensure the correct return value

On Wed, Dec 22, 2021 at 7:21 PM Peng Hao <[email protected]> wrote:
>
> When pci_iomap return NULL, the return value is zero.
>
> Signed-off-by: Peng Hao <[email protected]>
> ---

Acked-by: Jason Wang <[email protected]>

> drivers/virtio/virtio_pci_legacy_dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/virtio/virtio_pci_legacy_dev.c b/drivers/virtio/virtio_pci_legacy_dev.c
> index 9b97680dd02b..677d1f68bc9b 100644
> --- a/drivers/virtio/virtio_pci_legacy_dev.c
> +++ b/drivers/virtio/virtio_pci_legacy_dev.c
> @@ -45,8 +45,10 @@ int vp_legacy_probe(struct virtio_pci_legacy_device *ldev)
> return rc;
>
> ldev->ioaddr = pci_iomap(pci_dev, 0, 0);
> - if (!ldev->ioaddr)
> + if (!ldev->ioaddr) {
> + rc = -EIO;
> goto err_iomap;
> + }
>
> ldev->isr = ldev->ioaddr + VIRTIO_PCI_ISR;
>
> --
> 2.27.0
>