Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 525b9e1d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 992b2f0f 7c54a180

ipc/wcd-dsp-glink.c

+6 −3
Original line number Diff line number Diff line
@@ -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);

		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);

}