All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
	qemu-trivial@nongnu.org
Subject: Re: [PATCH-for-5.2 v2] tools/virtiofsd: Check vu_init() return value (CID 1435958)
Date: Mon, 2 Nov 2020 18:33:00 +0000	[thread overview]
Message-ID: <20201102183300.GO3673@work-vm> (raw)
In-Reply-To: <20201102092339.2034297-1-philmd@redhat.com>

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Since commit 6f5fd837889, vu_init() can fail if malloc() returns NULL.
> 
> This fixes the following Coverity warning:
> 
>   CID 1435958 (#1 of 1): Unchecked return value (CHECKED_RETURN)
> 
> Fixes: 6f5fd837889 ("libvhost-user: support many virtqueues")
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Queued.

> ---
> v2: Add fuse_log()

Thanks.

> ---
>  tools/virtiofsd/fuse_virtio.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
> index 324936948d3..83ba07c6cd8 100644
> --- a/tools/virtiofsd/fuse_virtio.c
> +++ b/tools/virtiofsd/fuse_virtio.c
> @@ -1013,8 +1013,11 @@ int virtio_session_mount(struct fuse_session *se)
>      se->vu_socketfd = data_sock;
>      se->virtio_dev->se = se;
>      pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL);
> -    vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL,
> -            fv_set_watch, fv_remove_watch, &fv_iface);
> +    if (!vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL,
> +                 fv_set_watch, fv_remove_watch, &fv_iface)) {
> +        fuse_log(FUSE_LOG_ERR, "%s: vu_init failed\n", __func__);
> +        return -1;
> +    }
>  
>      return 0;
>  }
> -- 
> 2.26.2
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK



WARNING: multiple messages have this Message-ID (diff)
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [PATCH-for-5.2 v2] tools/virtiofsd: Check vu_init() return value (CID 1435958)
Date: Mon, 2 Nov 2020 18:33:00 +0000	[thread overview]
Message-ID: <20201102183300.GO3673@work-vm> (raw)
In-Reply-To: <20201102092339.2034297-1-philmd@redhat.com>

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Since commit 6f5fd837889, vu_init() can fail if malloc() returns NULL.
> 
> This fixes the following Coverity warning:
> 
>   CID 1435958 (#1 of 1): Unchecked return value (CHECKED_RETURN)
> 
> Fixes: 6f5fd837889 ("libvhost-user: support many virtqueues")
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Queued.

> ---
> v2: Add fuse_log()

Thanks.

> ---
>  tools/virtiofsd/fuse_virtio.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
> index 324936948d3..83ba07c6cd8 100644
> --- a/tools/virtiofsd/fuse_virtio.c
> +++ b/tools/virtiofsd/fuse_virtio.c
> @@ -1013,8 +1013,11 @@ int virtio_session_mount(struct fuse_session *se)
>      se->vu_socketfd = data_sock;
>      se->virtio_dev->se = se;
>      pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL);
> -    vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL,
> -            fv_set_watch, fv_remove_watch, &fv_iface);
> +    if (!vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL,
> +                 fv_set_watch, fv_remove_watch, &fv_iface)) {
> +        fuse_log(FUSE_LOG_ERR, "%s: vu_init failed\n", __func__);
> +        return -1;
> +    }
>  
>      return 0;
>  }
> -- 
> 2.26.2
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK



  reply	other threads:[~2020-11-02 18:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02  9:23 [PATCH-for-5.2 v2] tools/virtiofsd: Check vu_init() return value (CID 1435958) Philippe Mathieu-Daudé
2020-11-02  9:23 ` Philippe Mathieu-Daudé
2020-11-02 18:33 ` Dr. David Alan Gilbert [this message]
2020-11-02 18:33   ` Dr. David Alan Gilbert

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=20201102183300.GO3673@work-vm \
    --to=dgilbert@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=stefanha@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.