evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: fix to avoid invalid memory access"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-06 14:33:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3dc6ea3f90
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/soc/qcom/wcd-dsp-glink.c
View file

@ -318,9 +318,6 @@ static void wdsp_glink_notify_state(void *handle, const void *priv,
if (ch->free_mem) { if (ch->free_mem) {
kfree(ch); kfree(ch);
ch = NULL; ch = NULL;
} else {
/* Open the glink channel again */
queue_work(wpriv->work_queue, &ch->lcl_ch_open_wrk);
} }
} else if (event == GLINK_REMOTE_DISCONNECTED) { } else if (event == GLINK_REMOTE_DISCONNECTED) {
dev_dbg(wpriv->dev, "%s: remote channel: %s disconnected remotely\n", dev_dbg(wpriv->dev, "%s: remote channel: %s disconnected remotely\n",
@ -607,6 +604,7 @@ static void wdsp_glink_tx_buf_work(struct work_struct *work)
mutex_lock(&tx_buf->ch->mutex); mutex_lock(&tx_buf->ch->mutex);
if (ch->channel_state == GLINK_CONNECTED) { if (ch->channel_state == GLINK_CONNECTED) {
mutex_unlock(&tx_buf->ch->mutex);
ret = glink_tx(ch->handle, tx_buf, ret = glink_tx(ch->handle, tx_buf,
cpkt->payload, cpkt->payload_size, cpkt->payload, cpkt->payload_size,
GLINK_TX_REQ_INTENT); GLINK_TX_REQ_INTENT);
@ -621,6 +619,7 @@ static void wdsp_glink_tx_buf_work(struct work_struct *work)
kfree(tx_buf); kfree(tx_buf);
} }
} else { } else {
mutex_unlock(&tx_buf->ch->mutex);
dev_err(wpriv->dev, "%s: channel %s is not in connected state\n", dev_err(wpriv->dev, "%s: channel %s is not in connected state\n",
__func__, ch->ch_cfg.name); __func__, ch->ch_cfg.name);
/* /*
@ -629,7 +628,6 @@ static void wdsp_glink_tx_buf_work(struct work_struct *work)
*/ */
kfree(tx_buf); kfree(tx_buf);
} }
mutex_unlock(&tx_buf->ch->mutex);
} }
/* /*