Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ipc: wcd-dsp-glink: prevent potential NULL pointer dereference"

Browse source
This commit is contained in:
Linux Build Service Account 2018-04-03 01:01:09 -07:00 • committed by Gerrit - the friendly Code Review server
commit 525b9e1daf
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ipc/wcd-dsp-glink.c
View file

@ -266,7 +266,7 @@ static void wdsp_tx_buf_work(struct work_struct *work)
spin_lock(&ch->ch_lock);
rpdev = ch->handle;
if (rpdev || ch->ch_state == WDSP_CH_CONNECTED) {
if (rpdev && ch->ch_state == WDSP_CH_CONNECTED) {
spin_unlock(&ch->ch_lock);
ret = rpmsg_send(rpdev->ept, cpkt->payload,
cpkt->payload_size);
@ -275,8 +275,11 @@ static void wdsp_tx_buf_work(struct work_struct *work)
__func__, ret);
} else {
spin_unlock(&ch->ch_lock);
dev_err(wpriv->dev, "%s: channel %s is not in connected state\n",
__func__, ch->ch_name);
if (rpdev)
dev_err(wpriv->dev, "%s: channel %s is not in connected state\n",
__func__, ch->ch_name);
else
dev_err(wpriv->dev, "%s: rpdev is NULL\n", __func__);
}
vfree(tx_buf);
}