diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-04-24 08:04:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-02 07:53:41 -0700 |
| commit | 4984b8bb89fc7d0f0415b4a48fc07333f7b7bbca (patch) | |
| tree | b832dfcd19e857d876d34aa2d019ad87f09663b8 /sound/pci | |
| parent | 7625e9fd5fa9862bce433a36a42d7364e4a6ba3f (diff) | |
| download | linux-stable-4984b8bb89fc7d0f0415b4a48fc07333f7b7bbca.tar.gz linux-stable-4984b8bb89fc7d0f0415b4a48fc07333f7b7bbca.tar.bz2 linux-stable-4984b8bb89fc7d0f0415b4a48fc07333f7b7bbca.zip | |
ALSA: rme9652: Hardening for potential Spectre v1
commit f526afcd8f71945c23ce581d7864ace93de8a4f7 upstream.
As recently Smatch suggested, one place in RME9652 driver may expand
the array directly from the user-space value with speculation:
sound/pci/rme9652/rme9652.c:2074 snd_rme9652_channel_info() warn: potential spectre issue 'rme9652->channel_map' (local cap)
This patch puts array_index_nospec() for hardening against it.
BugLink: https://marc.info/?l=linux-kernel&m=152411496503418&w=2
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/rme9652/rme9652.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index fdbc0aa2776a..c253bdf92e36 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/module.h> #include <linux/io.h> +#include <linux/nospec.h> #include <sound/core.h> #include <sound/control.h> @@ -2036,9 +2037,10 @@ static int snd_rme9652_channel_info(struct snd_pcm_substream *substream, if (snd_BUG_ON(info->channel >= RME9652_NCHANNELS)) return -EINVAL; - if ((chn = rme9652->channel_map[info->channel]) < 0) { + chn = rme9652->channel_map[array_index_nospec(info->channel, + RME9652_NCHANNELS)]; + if (chn < 0) return -EINVAL; - } info->offset = chn * RME9652_CHANNEL_BUFFER_BYTES; info->first = 0; |