summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2018-12-18 12:52:16 -0500
committerTakashi Iwai <tiwai@suse.de>2018-12-19 08:34:02 -0500
commit5ae4f61f012a097df93de2285070ec8e34716d29 (patch)
tree7e52e848a4414c037abc6ecdae46ca6ecd40a9e8 /sound
parent0b84304ef5da92add8dc75a1b07879c5374cdb05 (diff)
ALSA: emu10k1: Fix potential Spectre v1 vulnerabilities
ipcm->substream is indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability. This issue was detected with the help of Smatch: sound/pci/emu10k1/emufx.c:1031 snd_emu10k1_ipcm_poke() warn: potential spectre issue 'emu->fx8010.pcm' [r] (local cap) sound/pci/emu10k1/emufx.c:1075 snd_emu10k1_ipcm_peek() warn: potential spectre issue 'emu->fx8010.pcm' [r] (local cap) Fix this by sanitizing ipcm->substream before using it to index emu->fx8010.pcm Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1]. [1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 Cc: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/emu10k1/emufx.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 6ebe817801ea..1f25e6d029d8 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -36,6 +36,7 @@
36#include <linux/init.h> 36#include <linux/init.h>
37#include <linux/mutex.h> 37#include <linux/mutex.h>
38#include <linux/moduleparam.h> 38#include <linux/moduleparam.h>
39#include <linux/nospec.h>
39 40
40#include <sound/core.h> 41#include <sound/core.h>
41#include <sound/tlv.h> 42#include <sound/tlv.h>
@@ -1026,6 +1027,8 @@ static int snd_emu10k1_ipcm_poke(struct snd_emu10k1 *emu,
1026 1027
1027 if (ipcm->substream >= EMU10K1_FX8010_PCM_COUNT) 1028 if (ipcm->substream >= EMU10K1_FX8010_PCM_COUNT)
1028 return -EINVAL; 1029 return -EINVAL;
1030 ipcm->substream = array_index_nospec(ipcm->substream,
1031 EMU10K1_FX8010_PCM_COUNT);
1029 if (ipcm->channels > 32) 1032 if (ipcm->channels > 32)
1030 return -EINVAL; 1033 return -EINVAL;
1031 pcm = &emu->fx8010.pcm[ipcm->substream]; 1034 pcm = &emu->fx8010.pcm[ipcm->substream];
@@ -1072,6 +1075,8 @@ static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu,
1072 1075
1073 if (ipcm->substream >= EMU10K1_FX8010_PCM_COUNT) 1076 if (ipcm->substream >= EMU10K1_FX8010_PCM_COUNT)
1074 return -EINVAL; 1077 return -EINVAL;
1078 ipcm->substream = array_index_nospec(ipcm->substream,
1079 EMU10K1_FX8010_PCM_COUNT);
1075 pcm = &emu->fx8010.pcm[ipcm->substream]; 1080 pcm = &emu->fx8010.pcm[ipcm->substream];
1076 mutex_lock(&emu->fx8010.lock); 1081 mutex_lock(&emu->fx8010.lock);
1077 spin_lock_irq(&emu->reg_lock); 1082 spin_lock_irq(&emu->reg_lock);