diff options
author | Robb Glasser <rglasser@google.com> | 2017-12-05 12:16:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-12-05 17:28:08 -0500 |
commit | 362bca57f5d78220f8b5907b875961af9436e229 (patch) | |
tree | 744d83b54aa7820babaa178e52336159b024b161 | |
parent | f429e7e494afaded76e62c6f98211a635aa03098 (diff) |
ALSA: pcm: prevent UAF in snd_pcm_info
When the device descriptor is closed, the `substream->runtime` pointer
is freed. But another thread may be in the ioctl handler, case
SNDRV_CTL_IOCTL_PCM_INFO. This case calls snd_pcm_info_user() which
calls snd_pcm_info() which accesses the now freed `substream->runtime`.
Note: this fixes CVE-2017-0861
Signed-off-by: Robb Glasser <rglasser@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/core/pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 9070f277f8db..09ee8c6b9f75 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
@@ -153,7 +153,9 @@ static int snd_pcm_control_ioctl(struct snd_card *card, | |||
153 | err = -ENXIO; | 153 | err = -ENXIO; |
154 | goto _error; | 154 | goto _error; |
155 | } | 155 | } |
156 | mutex_lock(&pcm->open_mutex); | ||
156 | err = snd_pcm_info_user(substream, info); | 157 | err = snd_pcm_info_user(substream, info); |
158 | mutex_unlock(&pcm->open_mutex); | ||
157 | _error: | 159 | _error: |
158 | mutex_unlock(®ister_mutex); | 160 | mutex_unlock(®ister_mutex); |
159 | return err; | 161 | return err; |