Skip to contentSkip to conversation

vmw_balloon: release lock on error in vmballoon_reset()

PATCH In review Dan Carpenter 2 participants 2 messages Feb 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/misc/vmw_balloon.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/vmw_balloon.c +3 -2
index 6542a7711cac..ad807d5a3141 100644
@@ -1330,7 +1330,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)) {
@@ -1341,7 +1341,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);
@@ -1357,6 +1357,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);
 }
 
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw

PiBPbiBGZWIgMTEsIDIwMTksIGF0IDEwOjQ1IEFNLCBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVu dGVyQG9yYWNsZS5jb20+IHdyb3RlOg0KPiANCj4gV2UgYWRkZWQgc29tZSBsb2NraW5nIHRvIHRo aXMgZnVuY3Rpb24gYnV0IGZvcmdvdCB0byBkcm9wIHRoZSBsb2NrIG9uDQo+IHRoZXNlIHR3byBl cnJvciBwYXRocy4gIFRoaXMgYnVnIHdvdWxkIGxlYWQgdG8gYW4gaW1tZWRpYXRlIGRlYWRsb2Nr Lg0KPiANCj4gRml4ZXM6IGM3YjM2OTBmYjE1MiAoInZtd19iYWxsb29uOiBzdGF0cyByZXdvcmsi KQ0KPiBTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5j b20+DQoNCkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnDQpSZXZpZXdlZC1ieTogTmFkYXYgQW1p dCA8bmFtaXRAdm13YXJlLmNvbT4NCg0KLS0NCg0KWWVzLCBJIHNjcmV3ZWQgdXAuIFRoYW5rcyBm b3IgY2F0Y2hpbmcgaXQhDQoNCknigJlsbCBnbyB0byBjaGVjayB3aHkgbXkgZXJyb3IgaW5qZWN0 aW9uIHRlc3RzIGRpZG7igJl0IGNhdGNoIGl0Lg0KDQo