From 678c5b119307c40f9a17152512f9c949d0ec7292 Mon Sep 17 00:00:00 2001

From: Tuomas Tynkkynen <tuomas@tuxera.com>

Date: Fri, 13 Jul 2018 00:54:17 +0300

Subject: [PATCH] staging: bcm2835-audio: Don't leak workqueue if open fails

Git-commit: 678c5b119307c40f9a17152512f9c949d0ec7292

Patch-mainline: v4.19-rc1

References: FATE#324827

Currently, if bcm2835_audio_open() fails partway, the allocated

workqueue is leaked. Avoid that.

While at it, propagate the return value of

bcm2835_audio_open_connection() on failure instead of returning -1.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c |   16 +++++++-----

 1 file changed, 10 insertions(+), 6 deletions(-)

--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c

+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c

@@ -428,16 +428,16 @@ int bcm2835_audio_open(struct bcm2835_al

 		return -ENOMEM;

 	ret = bcm2835_audio_open_connection(alsa_stream);

-	if (ret) {

-		ret = -1;

-		goto exit;

-	}

+	if (ret)

+		goto free_wq;

+

 	instance = alsa_stream->instance;

 	LOG_DBG(" instance (%p)\n", instance);

 	if (mutex_lock_interruptible(&instance->vchi_mutex)) {

 		LOG_DBG("Interrupted whilst waiting for lock on (%d)\n", instance->num_connections);

-		return -EINTR;

+		ret = -EINTR;

+		goto free_wq;

 	}

 	vchi_service_use(instance->vchi_handle[0]);

@@ -460,7 +460,11 @@ int bcm2835_audio_open(struct bcm2835_al

 unlock:

 	vchi_service_release(instance->vchi_handle[0]);

 	mutex_unlock(&instance->vchi_mutex);

-exit:

+

+free_wq:

+	if (ret)

+		destroy_workqueue(alsa_stream->my_wq);

+

 	return ret;

 }