vhost: fix error handling in RESET_OWNER ioctl

[~andy/linux] / drivers / vhost / test.c

diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 91d6f060aade3d4fafdfe0b0bf9bcae45b62b0ac..be65414d5bb142cc80462d6d089f36f31059a17e 100644 (file)
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -219,13 +219,20 @@ static long vhost_test_reset_owner(struct vhost_test *n)
 {
        void *priv = NULL;
        long err;
+       struct vhost_memory *memory;
+
        mutex_lock(&n->dev.mutex);
        err = vhost_dev_check_owner(&n->dev);
        if (err)
                goto done;
+       memory = vhost_dev_reset_owner_prepare();
+       if (!memory) {
+               err = -ENOMEM;
+               goto done;
+       }
        vhost_test_stop(n, &priv);
        vhost_test_flush(n);
-       err = vhost_dev_reset_owner(&n->dev);
+       vhost_dev_reset_owner(&n->dev, memory);
 done:
        mutex_unlock(&n->dev.mutex);
        return err;