vmw_balloon: release lock on error in vmballoon_reset()

We added some locking to this function but forgot to drop the lock on
these two error paths.  This bug would lead to an immediate deadlock.

Fixes: c7b3690fb152 ("vmw_balloon: stats rework")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org
Reviewed-by: Nadav Amit <namit@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index f96dc3690ade052a0ae3a73e6d54e7eef9d6cd80..7842999a0d2466e62a0a1c6c6446d14977058821 100644 (file)
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -1298,7 +1298,7 @@ static void vmballoon_reset(struct vmballoon *b)
        vmballoon_pop(b);
 
        if (vmballoon_send_start(b, VMW_BALLOON_CAPABILITIES))
-               return;
+               goto unlock;
 
        if ((b->capabilities & VMW_BALLOON_BATCHED_CMDS) != 0) {
                if (vmballoon_init_batching(b)) {
@@ -1309,7 +1309,7 @@ static void vmballoon_reset(struct vmballoon *b)
                         * The guest will retry in one second.
                         */
                        vmballoon_send_start(b, 0);
-                       return;
+                       goto unlock;
                }
        } else if ((b->capabilities & VMW_BALLOON_BASIC_CMDS) != 0) {
                vmballoon_deinit_batching(b);
@@ -1325,6 +1325,7 @@ static void vmballoon_reset(struct vmballoon *b)
        if (vmballoon_send_guest_id(b))
                pr_err("failed to send guest ID to the host\n");
 
+unlock:
        up_write(&b->conf_sem);
 }