Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d04071a5 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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: c7b3690f ("vmw_balloon: stats rework")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarNadav Amit <namit@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32ea33a0

drivers/misc/vmw_balloon.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

}