Commit 71272988 authored by Xie Yongji's avatar Xie Yongji Committed by Pengyuan Zhao
Browse files

vp_vdpa: Fix return value check for vdpa_alloc_device() 

stable inclusion
from stable-v5.14
commit 9632e78e
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5WXCZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9632e78e82648aa98340df78eab9106f63da151e


----------------------------------------------------------------------

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: 64b9f64f ("vdpa: introduce virtio pci driver")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarXie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20210715080026.242-2-xieyongji@bytedance.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarPengyuan Zhao <zhaopengyuan@hisilicon.com>
parent d6e4e3d4

drivers/vdpa/virtio_pci/vp_vdpa.c

+2 −2
Original line number Diff line number Diff line
@@ -459,9 +459,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;