ASoC: msm: qdsp6v2: Fix deadlock due to mutex unlock
Mutex is not unlocked in one of the failure case
in sound model buffer allocation function. This
causes deadlock if the failure condition occurs.
This change handles the mutex unlock correctly in
failure case.
Change-Id: I24b52c8db329d8b5fdd00b06a280b08a286907cc
Signed-off-by: Venkat Sudhir <vsudhir@codeaurora.org>
diff --git a/sound/soc/msm/qdsp6v2/q6lsm.c b/sound/soc/msm/qdsp6v2/q6lsm.c
index c5483ee..aec048e 100644
--- a/sound/soc/msm/qdsp6v2/q6lsm.c
+++ b/sound/soc/msm/qdsp6v2/q6lsm.c
@@ -735,7 +735,7 @@
int rc = -EINVAL;
if (!client)
- goto fail;
+ return rc;
mutex_lock(&client->cmd_lock);
if (!client->sound_model.data) {
@@ -744,7 +744,6 @@
if (IS_ERR_OR_NULL(client->sound_model.client)) {
pr_err("%s: ION create client for AUDIO failed\n",
__func__);
- mutex_unlock(&client->cmd_lock);
goto fail;
}
client->sound_model.handle =
@@ -753,7 +752,6 @@
if (IS_ERR_OR_NULL(client->sound_model.handle)) {
pr_err("%s: ION memory allocation for AUDIO failed\n",
__func__);
- mutex_unlock(&client->cmd_lock);
goto fail;
}
@@ -764,7 +762,6 @@
if (rc) {
pr_err("%s: ION get physical mem failed, rc%d\n",
__func__, rc);
- mutex_unlock(&client->cmd_lock);
goto fail;
}
@@ -773,7 +770,6 @@
client->sound_model.handle);
if (IS_ERR_OR_NULL(client->sound_model.data)) {
pr_err("%s: ION memory mapping failed\n", __func__);
- mutex_unlock(&client->cmd_lock);
goto fail;
}
memset(client->sound_model.data, 0, len);
@@ -789,11 +785,13 @@
&client->sound_model.mem_map_handle);
if (rc < 0) {
pr_err("%s:CMD Memory_map_regions failed\n", __func__);
- goto fail;
+ goto exit;
}
return 0;
fail:
+ mutex_unlock(&client->cmd_lock);
+exit:
q6lsm_snd_model_buf_free(client);
return rc;
}