Skip to contentSkip to conversation

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

PATCH In review Philippe Mathieu-Daudé 2 participants 2 messages Nov 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 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")

---
v2: Add fuse_log()

---
 tools/virtiofsd/fuse_virtio.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
tools/virtiofsd/fuse_virtio.c +5 -2
index 324936948d3..83ba07c6cd8 100644
@@ -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;
 }
Signature · 1 line
2.26.2
#1 lore raw
Quoted 9 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")

Queued.

Quoted 2 lines

---
v2: Add fuse_log()

Thanks.

Quoted 25 lines
---
 tools/virtiofsd/fuse_virtio.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
tools/virtiofsd/fuse_virtio.c +5 -2
index 324936948d3..83ba07c6cd8 100644
@@ -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;
 }
Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK