lkml.org 
[lkml]   [2021]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 045/127] vDPA/ifcvf: Fix return value check for vdpa_alloc_device()
    Date
    From: Xie Yongji <xieyongji@bytedance.com>

    [ Upstream commit 1057afa0121db8bd3ca4718c8e0ca12388ab7759 ]

    The vdpa_alloc_device() returns an error pointer upon
    failure, not NULL. To handle the failure correctly, this
    replaces NULL check with IS_ERR() check and propagate the
    error upwards.

    Fixes: 5a2414bc454e ("virtio: Intel IFC VF driver for VDPA")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
    Link: https://lore.kernel.org/r/20210715080026.242-3-xieyongji@bytedance.com
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Acked-by: Jason Wang <jasowang@redhat.com>
    Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/vdpa/ifcvf/ifcvf_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
    index ab0ab5cf0f6e..1c6cd5276a50 100644
    --- a/drivers/vdpa/ifcvf/ifcvf_main.c
    +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
    @@ -477,9 +477,9 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)

    adapter = vdpa_alloc_device(struct ifcvf_adapter, vdpa,
    dev, &ifc_vdpa_ops, NULL);
    - if (adapter == NULL) {
    + if (IS_ERR(adapter)) {
    IFCVF_ERR(pdev, "Failed to allocate vDPA structure");
    - return -ENOMEM;
    + return PTR_ERR(adapter);
    }

    pci_set_master(pdev);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-24 19:01    [W:2.267 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site