Merge "ASoC: qdsp6v2: Fix null pointer dereference for prtd pointer"

This commit is contained in:
Linux Build Service Account 2018-06-14 16:06:54 -07:00 committed by Gerrit - the friendly Code Review server
commit f9a1c8211f

View file

@ -660,6 +660,7 @@ static int msm_pcm_open(struct snd_pcm_substream *substream)
if (!prtd->audio_client) {
pr_info("%s: Could not allocate memory\n", __func__);
kfree(prtd);
prtd = NULL;
return -ENOMEM;
}
@ -1135,6 +1136,12 @@ static int msm_pcm_adsp_stream_cmd_put(struct snd_kcontrol *kcontrol,
}
prtd = substream->runtime->private_data;
if (prtd == NULL) {
pr_err("%s prtd is null.\n", __func__);
ret = -EINVAL;
goto done;
}
if (prtd->audio_client == NULL) {
pr_err("%s prtd is null.\n", __func__);
ret = -EINVAL;