From: Xie Yongji <xieyongji@bytedance.com>
To: mst@redhat.com, jasowang@redhat.com, dan.carpenter@oracle.com
Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] vp_vdpa: Fix return value check for vdpa_alloc_device()
Date: Thu, 15 Jul 2021 16:00:24 +0800 [thread overview]
Message-ID: <20210715080026.242-2-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210715080026.242-1-xieyongji@bytedance.com>
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>
---
drivers/vdpa/virtio_pci/vp_vdpa.c | 4 ++--
1 file 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;
--
2.11.0
next prev parent reply other threads:[~2021-07-15 8:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 8:00 [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device() Xie Yongji
2021-07-15 8:00 ` Xie Yongji [this message]
2021-07-15 8:08 ` [PATCH 2/4] vp_vdpa: " Jason Wang
2021-07-26 9:28 ` Stefano Garzarella
2021-07-15 8:00 ` [PATCH 3/4] vDPA/ifcvf: " Xie Yongji
2021-07-15 8:09 ` Jason Wang
2021-07-26 9:28 ` Stefano Garzarella
2021-07-15 8:00 ` [PATCH 4/4] vdpa: Add documentation for vdpa_alloc_device() macro Xie Yongji
2021-07-15 8:10 ` Jason Wang
2021-07-26 9:29 ` Stefano Garzarella
2021-07-26 9:28 ` [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device() Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210715080026.242-2-xieyongji@bytedance.com \
--to=xieyongji@bytedance.com \
--cc=dan.carpenter@oracle.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).