summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVidyakumar Athota <vathota@codeaurora.org>2017-03-23 13:35:22 -0700
committerVidyakumar Athota <vathota@codeaurora.org>2017-03-23 13:48:55 -0700
commitb9732c9865d7ddf8eb5ba6d27db8081ad59c815a (patch)
tree82409683eee13b8c4da149fa56f33c4f02394ea5
parent630218f7109215471e1f43c2200f6bdc98f92f93 (diff)
soc: qcom: fix to avoid multiple memory allocations
There is a chance that glink channel memory can be allocated multiple times if wdsp_glink_ch_info_init() is called from multiple threads. Avoid this scenario by protecting the private data structure. Change-Id: I04fc19232b0f128b36a00dc1e73a3bed03664a93 Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
-rw-r--r--drivers/soc/qcom/wcd-dsp-glink.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/soc/qcom/wcd-dsp-glink.c b/drivers/soc/qcom/wcd-dsp-glink.c
index 1ceded4db79f..f601e6646852 100644
--- a/drivers/soc/qcom/wcd-dsp-glink.c
+++ b/drivers/soc/qcom/wcd-dsp-glink.c
@@ -531,6 +531,13 @@ static int wdsp_glink_ch_info_init(struct wdsp_glink_priv *wpriv,
u8 *payload;
u32 ch_size, ch_cfg_size;
+ mutex_lock(&wpriv->glink_mutex);
+ if (wpriv->ch) {
+ dev_err(wpriv->dev, "%s: glink ch memory is already allocated\n",
+ __func__);
+ ret = -EINVAL;
+ goto done;
+ }
payload = (u8 *)pkt->payload;
no_of_channels = pkt->no_of_channels;
@@ -611,6 +618,7 @@ err_ch_mem:
wpriv->no_of_channels = 0;
done:
+ mutex_unlock(&wpriv->glink_mutex);
return ret;
}