vhost-vdpa: don't check g_malloc() return value

[PATCH] vhost-vdpa: don't check g_malloc() return value

Posted by Laurent Vivier 5 years, 4 months ago

On failure, g_malloc() aborts the program, we don't need to check the
return value

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 hw/virtio/vhost-vdpa.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 4580f3efd8a2..23a4a957ef77 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -321,9 +321,6 @@ static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data,
     int ret;
     unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
     config = g_malloc(size + config_size);
-    if (config == NULL) {
-        return -1;
-    }
     config->off = offset;
     config->len = size;
     memcpy(config->buf, data, size);
@@ -340,9 +337,6 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, uint8_t *config,
     int ret;
 
     v_config = g_malloc(config_len + config_size);
-    if (v_config == NULL) {
-        return -1;
-    }
     v_config->len = config_len;
     v_config->off = 0;
     ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_CONFIG, v_config);
-- 
2.26.2

Re: [PATCH] vhost-vdpa: don't check g_malloc() return value

Posted by Thomas Huth 5 years, 4 months ago

On 18/09/2020 14.03, Laurent Vivier wrote:
> On failure, g_malloc() aborts the program, we don't need to check the
> return value
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  hw/virtio/vhost-vdpa.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 4580f3efd8a2..23a4a957ef77 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -321,9 +321,6 @@ static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data,
>      int ret;
>      unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
>      config = g_malloc(size + config_size);
> -    if (config == NULL) {
> -        return -1;
> -    }
>      config->off = offset;
>      config->len = size;
>      memcpy(config->buf, data, size);
> @@ -340,9 +337,6 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, uint8_t *config,
>      int ret;
>  
>      v_config = g_malloc(config_len + config_size);
> -    if (v_config == NULL) {
> -        return -1;
> -    }
>      v_config->len = config_len;
>      v_config->off = 0;
>      ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_CONFIG, v_config);
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH] vhost-vdpa: don't check g_malloc() return value

Posted by Li Qiang 5 years, 4 months ago

Laurent Vivier <lvivier@redhat.com> 于2020年9月18日周五 下午8:04写道：
>
> On failure, g_malloc() aborts the program, we don't need to check the
> return value
>

In fact, I have sent this one month agon.
-->https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg04444.html

If you use this you can add my R-b tag:

Reviewed-by: Li Qiang <liq3ea@gmail.com>

> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  hw/virtio/vhost-vdpa.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 4580f3efd8a2..23a4a957ef77 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -321,9 +321,6 @@ static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data,
>      int ret;
>      unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
>      config = g_malloc(size + config_size);
> -    if (config == NULL) {
> -        return -1;
> -    }
>      config->off = offset;
>      config->len = size;
>      memcpy(config->buf, data, size);
> @@ -340,9 +337,6 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, uint8_t *config,
>      int ret;
>
>      v_config = g_malloc(config_len + config_size);
> -    if (v_config == NULL) {
> -        return -1;
> -    }
>      v_config->len = config_len;
>      v_config->off = 0;
>      ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_CONFIG, v_config);
> --
> 2.26.2
>
>