diff options
author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2018-12-18 12:18:34 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-12-19 08:32:41 -0500 |
commit | 0b84304ef5da92add8dc75a1b07879c5374cdb05 (patch) | |
tree | a3f09b35b3ca14e353c8d247abb2bbb40ca38a28 /sound | |
parent | ed49e839199e73966b9ff5946c3e87759827b40e (diff) |
ALSA: rme9652: Fix potential Spectre v1 vulnerability
info->channel 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/rme9652/hdsp.c:4100 snd_hdsp_channel_info() warn: potential spectre issue 'hdsp->channel_map' [r] (local cap)
Fix this by sanitizing info->channel before using it to index hdsp->channel_map
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].
Also, notice that I refactored the code a bit in order to get rid of the
following checkpatch warning:
ERROR: do not use assignment in if condition
FILE: sound/pci/rme9652/hdsp.c:4103:
if ((mapped_channel = hdsp->channel_map[info->channel]) < 0)
[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/rme9652/hdsp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 1bff4b1b39cd..ba99ff0e93e0 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/math64.h> | 30 | #include <linux/math64.h> |
31 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
33 | #include <linux/nospec.h> | ||
33 | 34 | ||
34 | #include <sound/core.h> | 35 | #include <sound/core.h> |
35 | #include <sound/control.h> | 36 | #include <sound/control.h> |
@@ -4092,15 +4093,16 @@ static int snd_hdsp_channel_info(struct snd_pcm_substream *substream, | |||
4092 | struct snd_pcm_channel_info *info) | 4093 | struct snd_pcm_channel_info *info) |
4093 | { | 4094 | { |
4094 | struct hdsp *hdsp = snd_pcm_substream_chip(substream); | 4095 | struct hdsp *hdsp = snd_pcm_substream_chip(substream); |
4095 | int mapped_channel; | 4096 | unsigned int channel = info->channel; |
4096 | 4097 | ||
4097 | if (snd_BUG_ON(info->channel >= hdsp->max_channels)) | 4098 | if (snd_BUG_ON(channel >= hdsp->max_channels)) |
4098 | return -EINVAL; | 4099 | return -EINVAL; |
4100 | channel = array_index_nospec(channel, hdsp->max_channels); | ||
4099 | 4101 | ||
4100 | if ((mapped_channel = hdsp->channel_map[info->channel]) < 0) | 4102 | if (hdsp->channel_map[channel] < 0) |
4101 | return -EINVAL; | 4103 | return -EINVAL; |
4102 | 4104 | ||
4103 | info->offset = mapped_channel * HDSP_CHANNEL_BUFFER_BYTES; | 4105 | info->offset = hdsp->channel_map[channel] * HDSP_CHANNEL_BUFFER_BYTES; |
4104 | info->first = 0; | 4106 | info->first = 0; |
4105 | info->step = 32; | 4107 | info->step = 32; |
4106 | return 0; | 4108 | return 0; |