A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

asoc: msm-pcm: move null ptr check after lock

Browse source 
Null pointer for runtime is checked before acquiring the lock.
By the time, it acquires lock and tries to access private
data runtime may be removed which can lead to null ptr
dereference.

Change-Id: I86ca89bd7dbd765c040bab2a292f62c2d3164140
Signed-off-by: Vikram Panduranga <vpandura@codeaurora.org>
This commit is contained in:
Vikram Panduranga 2019-10-14 12:44:25 -07:00
commit 2b0c995899
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
asoc/msm-pcm-q6-v2.c
View file

@ -1797,11 +1797,11 @@ static int msm_pcm_chmap_ctl_put(struct snd_kcontrol *kcontrol,
}
}
if (!substream->runtime || !rtd)
if (!rtd)
return 0;
mutex_lock(&pdata->lock);
prtd = substream->runtime->private_data;
prtd = substream->runtime ? substream->runtime->private_data : NULL;
if (prtd) {
prtd->set_channel_map = true;
for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V8; i++)
@ -1864,11 +1864,11 @@ static int msm_pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol,
memset(ucontrol->value.integer.value, 0,
sizeof(ucontrol->value.integer.value));
if (!substream->runtime || !rtd)
if (!rtd)
return 0; /* no channels set */
mutex_lock(&pdata->lock);
prtd = substream->runtime->private_data;
prtd = substream->runtime ? substream->runtime->private_data : NULL;
if (prtd && prtd->set_channel_map == true) {
for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V8; i++)