ALSA: rme9652: Fix potential Spectre v1 vulnerability

[mirror_ubuntu-bionic-kernel.git] / sound / pci / rme9652 / hdsp.c

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 1bff4b1b39cd04651f16efa1e151ca87c2804d9c..ba99ff0e93e0307aebc79d7dd2e59fb2d7a3b5fb 100644 (file)
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -30,6 +30,7 @@
 #include <linux/math64.h>
 #include <linux/vmalloc.h>
 #include <linux/io.h>
+#include <linux/nospec.h>
 
 #include <sound/core.h>
 #include <sound/control.h>
@@ -4092,15 +4093,16 @@ static int snd_hdsp_channel_info(struct snd_pcm_substream *substream,
                                    struct snd_pcm_channel_info *info)
 {
        struct hdsp *hdsp = snd_pcm_substream_chip(substream);
-       int mapped_channel;
+       unsigned int channel = info->channel;
 
-       if (snd_BUG_ON(info->channel >= hdsp->max_channels))
+       if (snd_BUG_ON(channel >= hdsp->max_channels))
                return -EINVAL;
+       channel = array_index_nospec(channel, hdsp->max_channels);
 
-       if ((mapped_channel = hdsp->channel_map[info->channel]) < 0)
+       if (hdsp->channel_map[channel] < 0)
                return -EINVAL;
 
-       info->offset = mapped_channel * HDSP_CHANNEL_BUFFER_BYTES;
+       info->offset = hdsp->channel_map[channel] * HDSP_CHANNEL_BUFFER_BYTES;
        info->first = 0;
        info->step = 32;
        return 0;