* [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device()
@ 2021-07-15 8:00 Xie Yongji
2021-07-15 8:00 ` [PATCH 2/4] vp_vdpa: " Xie Yongji
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Xie Yongji @ 2021-07-15 8:00 UTC (permalink / raw)
To: mst, jasowang, dan.carpenter; +Cc: virtualization, linux-kernel
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: 2c53d0f64c06 ("vdpasim: vDPA device simulator")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 14e024de5cbf..c621cf7feec0 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -251,8 +251,10 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
dev_attr->name);
- if (!vdpasim)
+ if (IS_ERR(vdpasim)) {
+ ret = PTR_ERR(vdpasim);
goto err_alloc;
+ }
vdpasim->dev_attr = *dev_attr;
INIT_WORK(&vdpasim->work, dev_attr->work_fn);
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/4] vp_vdpa: Fix return value check for vdpa_alloc_device()
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
2021-07-15 8:08 ` Jason Wang
2021-07-26 9:28 ` Stefano Garzarella
2021-07-15 8:00 ` [PATCH 3/4] vDPA/ifcvf: " Xie Yongji
` (2 subsequent siblings)
3 siblings, 2 replies; 13+ messages in thread
From: Xie Yongji @ 2021-07-15 8:00 UTC (permalink / raw)
To: mst, jasowang, dan.carpenter; +Cc: virtualization, linux-kernel
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/4] vp_vdpa: Fix return value check for vdpa_alloc_device()
2021-07-15 8:00 ` [PATCH 2/4] vp_vdpa: " Xie Yongji
@ 2021-07-15 8:08 ` Jason Wang
2021-07-26 9:28 ` Stefano Garzarella
1 sibling, 0 replies; 13+ messages in thread
From: Jason Wang @ 2021-07-15 8:08 UTC (permalink / raw)
To: Xie Yongji, mst, dan.carpenter; +Cc: virtualization, linux-kernel
在 2021/7/15 下午4:00, Xie Yongji 写道:
> 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>
Acked-by: Jason Wang <jasowang@redhat.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;
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/4] vp_vdpa: Fix return value check for vdpa_alloc_device()
2021-07-15 8:00 ` [PATCH 2/4] vp_vdpa: " Xie Yongji
2021-07-15 8:08 ` Jason Wang
@ 2021-07-26 9:28 ` Stefano Garzarella
1 sibling, 0 replies; 13+ messages in thread
From: Stefano Garzarella @ 2021-07-26 9:28 UTC (permalink / raw)
To: Xie Yongji; +Cc: mst, jasowang, dan.carpenter, virtualization, linux-kernel
On Thu, Jul 15, 2021 at 04:00:24PM +0800, Xie Yongji wrote:
>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
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/4] vDPA/ifcvf: Fix return value check for vdpa_alloc_device()
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 ` [PATCH 2/4] vp_vdpa: " Xie Yongji
@ 2021-07-15 8:00 ` 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-26 9:28 ` [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device() Stefano Garzarella
3 siblings, 2 replies; 13+ messages in thread
From: Xie Yongji @ 2021-07-15 8:00 UTC (permalink / raw)
To: mst, jasowang, dan.carpenter; +Cc: virtualization, linux-kernel
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>
---
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 21b78f1cd521..351c6cfb24c3 100644
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -493,9 +493,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.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/4] vDPA/ifcvf: Fix return value check for vdpa_alloc_device()
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
1 sibling, 0 replies; 13+ messages in thread
From: Jason Wang @ 2021-07-15 8:09 UTC (permalink / raw)
To: Xie Yongji, mst, dan.carpenter; +Cc: virtualization, linux-kernel
在 2021/7/15 下午4:00, Xie Yongji 写道:
> 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>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> 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 21b78f1cd521..351c6cfb24c3 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_main.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
> @@ -493,9 +493,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);
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 3/4] vDPA/ifcvf: Fix return value check for vdpa_alloc_device()
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
1 sibling, 0 replies; 13+ messages in thread
From: Stefano Garzarella @ 2021-07-26 9:28 UTC (permalink / raw)
To: Xie Yongji; +Cc: mst, jasowang, dan.carpenter, virtualization, linux-kernel
On Thu, Jul 15, 2021 at 04:00:25PM +0800, Xie Yongji wrote:
>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>
>---
> 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 21b78f1cd521..351c6cfb24c3 100644
>--- a/drivers/vdpa/ifcvf/ifcvf_main.c
>+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
>@@ -493,9 +493,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.11.0
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/4] vdpa: Add documentation for vdpa_alloc_device() macro
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 ` [PATCH 2/4] vp_vdpa: " Xie Yongji
2021-07-15 8:00 ` [PATCH 3/4] vDPA/ifcvf: " Xie Yongji
@ 2021-07-15 8:00 ` 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
3 siblings, 2 replies; 13+ messages in thread
From: Xie Yongji @ 2021-07-15 8:00 UTC (permalink / raw)
To: mst, jasowang, dan.carpenter; +Cc: virtualization, linux-kernel
The return value of vdpa_alloc_device() macro is not very
clear, so that most of callers did the wrong check. Let's
add some comments to better document it.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
include/linux/vdpa.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
index 3357ac98878d..8cfe49d201dd 100644
--- a/include/linux/vdpa.h
+++ b/include/linux/vdpa.h
@@ -277,6 +277,17 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,
const struct vdpa_config_ops *config,
size_t size, const char *name);
+/**
+ * vdpa_alloc_device - allocate and initilaize a vDPA device
+ *
+ * @dev_struct: the type of the parent structure
+ * @member: the name of struct vdpa_device within the @dev_struct
+ * @parent: the parent device
+ * @config: the bus operations that is supported by this device
+ * @name: name of the vdpa device
+ *
+ * Return allocated data structure or ERR_PTR upon error
+ */
#define vdpa_alloc_device(dev_struct, member, parent, config, name) \
container_of(__vdpa_alloc_device( \
parent, config, \
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 4/4] vdpa: Add documentation for vdpa_alloc_device() macro
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
1 sibling, 0 replies; 13+ messages in thread
From: Jason Wang @ 2021-07-15 8:10 UTC (permalink / raw)
To: Xie Yongji, mst, dan.carpenter; +Cc: virtualization, linux-kernel
在 2021/7/15 下午4:00, Xie Yongji 写道:
> The return value of vdpa_alloc_device() macro is not very
> clear, so that most of callers did the wrong check. Let's
> add some comments to better document it.
>
> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> include/linux/vdpa.h | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
> index 3357ac98878d..8cfe49d201dd 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -277,6 +277,17 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,
> const struct vdpa_config_ops *config,
> size_t size, const char *name);
>
> +/**
> + * vdpa_alloc_device - allocate and initilaize a vDPA device
> + *
> + * @dev_struct: the type of the parent structure
> + * @member: the name of struct vdpa_device within the @dev_struct
> + * @parent: the parent device
> + * @config: the bus operations that is supported by this device
> + * @name: name of the vdpa device
> + *
> + * Return allocated data structure or ERR_PTR upon error
> + */
> #define vdpa_alloc_device(dev_struct, member, parent, config, name) \
> container_of(__vdpa_alloc_device( \
> parent, config, \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/4] vdpa: Add documentation for vdpa_alloc_device() macro
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
1 sibling, 0 replies; 13+ messages in thread
From: Stefano Garzarella @ 2021-07-26 9:29 UTC (permalink / raw)
To: Xie Yongji; +Cc: mst, jasowang, dan.carpenter, virtualization, linux-kernel
On Thu, Jul 15, 2021 at 04:00:26PM +0800, Xie Yongji wrote:
>The return value of vdpa_alloc_device() macro is not very
>clear, so that most of callers did the wrong check. Let's
>add some comments to better document it.
>
>Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
>---
> include/linux/vdpa.h | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
>diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
>index 3357ac98878d..8cfe49d201dd 100644
>--- a/include/linux/vdpa.h
>+++ b/include/linux/vdpa.h
>@@ -277,6 +277,17 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,
> const struct vdpa_config_ops *config,
> size_t size, const char *name);
>
>+/**
>+ * vdpa_alloc_device - allocate and initilaize a vDPA device
>+ *
>+ * @dev_struct: the type of the parent structure
>+ * @member: the name of struct vdpa_device within the @dev_struct
>+ * @parent: the parent device
>+ * @config: the bus operations that is supported by this device
>+ * @name: name of the vdpa device
>+ *
>+ * Return allocated data structure or ERR_PTR upon error
>+ */
> #define vdpa_alloc_device(dev_struct, member, parent, config, name) \
> container_of(__vdpa_alloc_device( \
> parent, config, \
>--
>2.11.0
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device()
2021-07-15 8:00 [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device() Xie Yongji
` (2 preceding siblings ...)
2021-07-15 8:00 ` [PATCH 4/4] vdpa: Add documentation for vdpa_alloc_device() macro Xie Yongji
@ 2021-07-26 9:28 ` Stefano Garzarella
3 siblings, 0 replies; 13+ messages in thread
From: Stefano Garzarella @ 2021-07-26 9:28 UTC (permalink / raw)
To: Xie Yongji; +Cc: mst, jasowang, dan.carpenter, virtualization, linux-kernel
On Thu, Jul 15, 2021 at 04:00:23PM +0800, Xie Yongji wrote:
>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: 2c53d0f64c06 ("vdpasim: vDPA device simulator")
>Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
>---
> drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
>index 14e024de5cbf..c621cf7feec0 100644
>--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
>+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
>@@ -251,8 +251,10 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)
>
> vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
> dev_attr->name);
>- if (!vdpasim)
>+ if (IS_ERR(vdpasim)) {
>+ ret = PTR_ERR(vdpasim);
> goto err_alloc;
>+ }
>
> vdpasim->dev_attr = *dev_attr;
> INIT_WORK(&vdpasim->work, dev_attr->work_fn);
>--
>2.11.0
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device()
@ 2021-07-15 7:59 Xie Yongji
2021-07-15 8:03 ` Jason Wang
0 siblings, 1 reply; 13+ messages in thread
From: Xie Yongji @ 2021-07-15 7:59 UTC (permalink / raw)
To: mst, jasowang, dan.carpenter; +Cc: virtualization, linux-kernel
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: 2c53d0f64c06 ("vdpasim: vDPA device simulator")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 14e024de5cbf..c621cf7feec0 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -251,8 +251,10 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
dev_attr->name);
- if (!vdpasim)
+ if (IS_ERR(vdpasim)) {
+ ret = PTR_ERR(vdpasim);
goto err_alloc;
+ }
vdpasim->dev_attr = *dev_attr;
INIT_WORK(&vdpasim->work, dev_attr->work_fn);
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 1/4] vdpa_sim: Fix return value check for vdpa_alloc_device()
2021-07-15 7:59 Xie Yongji
@ 2021-07-15 8:03 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2021-07-15 8:03 UTC (permalink / raw)
To: Xie Yongji, mst, dan.carpenter; +Cc: virtualization, linux-kernel
在 2021/7/15 下午3:59, Xie Yongji 写道:
> 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: 2c53d0f64c06 ("vdpasim: vDPA device simulator")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
> index 14e024de5cbf..c621cf7feec0 100644
> --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
> +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
> @@ -251,8 +251,10 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)
>
> vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
> dev_attr->name);
> - if (!vdpasim)
> + if (IS_ERR(vdpasim)) {
> + ret = PTR_ERR(vdpasim);
> goto err_alloc;
> + }
>
> vdpasim->dev_attr = *dev_attr;
> INIT_WORK(&vdpasim->work, dev_attr->work_fn);
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-07-26 9:30 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 2/4] vp_vdpa: " Xie Yongji
2021-07-15 8:08 ` 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
-- strict thread matches above, loose matches on Subject: below --
2021-07-15 7:59 Xie Yongji
2021-07-15 8:03 ` Jason Wang
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).