Skip to contentSkip to conversation

tools/virtiofsd: Check vu_init() return value (CID 1435958)

RFC Superseded Philippe Mathieu-Daudé 2 participants 2 messages Oct 30, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

RFC 1/1 tools/virtiofsd: Check vu_init() return value (CID 1435958)

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")
---
 tools/virtiofsd/fuse_virtio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tools/virtiofsd/fuse_virtio.c +4 -2
index 324936948d3..3a32256e7af 100644
@@ -1013,8 +1013,10 @@ 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)) {
+        return -1;
+    }
 
     return 0;
 }
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · * Philippe Mathieu-Daudé ([email protected]) 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")

A fuse_log would have been nice.

Quoted 24 lines
---
 tools/virtiofsd/fuse_virtio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tools/virtiofsd/fuse_virtio.c +4 -2
index 324936948d3..3a32256e7af 100644
@@ -1013,8 +1013,10 @@ 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)) {
+        return -1;
+    }
 
     return 0;
 }
Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK