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

Bu işleme şunda yer alıyor:
Linux Build Service Account
2018-11-18 23:46:57 -08:00
işlemeyi yapan: Gerrit - the friendly Code Review server
işleme e95846085a

Dosyayı Görüntüle

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