diff options
author | Xie Yongji <xieyongji@bytedance.com> | 2021-07-15 16:00:24 +0800 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2021-08-11 06:44:23 -0400 |
commit | 9632e78e82648aa98340df78eab9106f63da151e (patch) | |
tree | 26102263fe65d82d346735a925b6664cea1dea32 /drivers/vdpa/virtio_pci | |
parent | 2b847f21145d84e2e1dde99d3e2c00a5468f02e4 (diff) | |
download | linux-stable-9632e78e82648aa98340df78eab9106f63da151e.tar.gz linux-stable-9632e78e82648aa98340df78eab9106f63da151e.tar.bz2 linux-stable-9632e78e82648aa98340df78eab9106f63da151e.zip |
vp_vdpa: Fix return value check for vdpa_alloc_device()
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: 64b9f64f80a6 ("vdpa: introduce virtio pci driver")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20210715080026.242-2-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>
Diffstat (limited to 'drivers/vdpa/virtio_pci')
-rw-r--r-- | drivers/vdpa/virtio_pci/vp_vdpa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c index 7b4a6396c553..fe0527329857 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -436,9 +436,9 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa, dev, &vp_vdpa_ops, NULL); - if (vp_vdpa == NULL) { + if (IS_ERR(vp_vdpa)) { dev_err(dev, "vp_vdpa: Failed to allocate vDPA structure\n"); - return -ENOMEM; + return PTR_ERR(vp_vdpa); } mdev = &vp_vdpa->mdev; |