diff options
| author | Robb Glasser <rglasser@google.com> | 2017-12-05 09:16:55 -0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-01-17 12:55:23 -0500 |
| commit | 0bde6f9d1faf3d4aaf8346d8a326cf02e7ea1a3a (patch) | |
| tree | 6ca91f202b8c7e8a94b3f11114935d4bdb16a674 /sound | |
| parent | fad18b48c112a932c80a77f38a5dc26bd0e13a2e (diff) | |
ALSA: pcm: prevent UAF in snd_pcm_info
[ Upstream commit 362bca57f5d78220f8b5907b875961af9436e229 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'sound')
| -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 f6e7fdd354de..7c60cb289719 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -149,7 +149,9 @@ static int snd_pcm_control_ioctl(struct snd_card *card, err = -ENXIO; goto _error; } + mutex_lock(&pcm->open_mutex); err = snd_pcm_info_user(substream, info); + mutex_unlock(&pcm->open_mutex); _error: mutex_unlock(®ister_mutex); return err; |