[PATCH 1/2] vhost-user-blk: handle errors in vhost_user_blk_connect

[PATCH 1/2] vhost-user-blk: handle errors in vhost_user_blk_connect

[Konstantin Khlebnikov]

Cleanup vhost device and update connection state when initialization fails.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
 hw/block/vhost-user-blk.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 1a42ae9187..35ac188ca4 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -340,18 +340,24 @@ static int vhost_user_blk_connect(DeviceState *dev, Error **errp)
     ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0,
                          errp);
     if (ret < 0) {
-        return ret;
+        goto err_init;
     }
 
     /* restore vhost state */
     if (virtio_device_started(vdev, vdev->status)) {
         ret = vhost_user_blk_start(vdev, errp);
         if (ret < 0) {
-            return ret;
+            goto err_start;
         }
     }
 
     return 0;
+
+err_start:
+    vhost_dev_cleanup(&s->dev);
+err_init:
+    s->connected = false;
+    return ret;
 }
 
 static void vhost_user_blk_disconnect(DeviceState *dev)

[PATCH 2/2] vhost-user-blk: check connection state in vhost_user_blk_set_config

[Konstantin Khlebnikov]

Fuzzing found that ->set_config() could be called without connection.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
 hw/block/vhost-user-blk.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 35ac188ca4..9ac50443bc 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -72,6 +72,10 @@ static void vhost_user_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
     struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
     int ret;
 
+    if (!s->connected) {
+        return;
+    }
+
     if (blkcfg->wce == s->blkcfg.wce) {
         return;
     }

Re: [PATCH 1/2] vhost-user-blk: handle errors in vhost_user_blk_connect

[Philippe Mathieu-Daudé via]

On 10/2/22 12:46, Konstantin Khlebnikov wrote:
> Cleanup vhost device and update connection state when initialization fails.
> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> ---
>   hw/block/vhost-user-blk.c |   10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
> index 1a42ae9187..35ac188ca4 100644
> --- a/hw/block/vhost-user-blk.c
> +++ b/hw/block/vhost-user-blk.c
> @@ -340,18 +340,24 @@ static int vhost_user_blk_connect(DeviceState *dev, Error **errp)
>       ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0,
>                            errp);
>       if (ret < 0) {
> -        return ret;
> +        goto err_init;
>       }
>   
>       /* restore vhost state */
>       if (virtio_device_started(vdev, vdev->status)) {
>           ret = vhost_user_blk_start(vdev, errp);
>           if (ret < 0) {
> -            return ret;
> +            goto err_start;
>           }
>       }

What about moving here ...:

     s->connected = true;

>   
>       return 0;
> +
> +err_start:
> +    vhost_dev_cleanup(&s->dev);
> +err_init:
> +    s->connected = false;

... to have a single 'err' label?

> +    return ret;
>   }
>   
>   static void vhost_user_blk_disconnect(DeviceState *dev)
> 
> 

Re: [PATCH 1/2] vhost-user-blk: handle errors in vhost_user_blk_connect

[Konstantin Khlebnikov]

[-- Attachment #1: Type: text/html, Size: 2354 bytes --]