From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH 8/8] ALSA: rme9652: Hardening for potential Spectre v1
Date: Tue, 24 Apr 2018 09:56:19 +0200 [thread overview]
Message-ID: <20180424075619.29602-9-tiwai@suse.de> (raw)
In-Reply-To: <20180424075619.29602-1-tiwai@suse.de>
As the recent Smatch warned, 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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/rme9652/rme9652.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index df648b1d9217..edd765e22377 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>
@@ -2071,9 +2072,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;
--
2.16.3
prev parent reply other threads:[~2018-04-24 7:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 7:56 [PATCH 0/8] ALSA: Hardening for potential Spectre v1 Takashi Iwai
2018-04-24 7:56 ` [PATCH 1/8] ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device Takashi Iwai
2018-04-24 7:56 ` [PATCH 2/8] ALSA: seq: oss: Hardening for potential Spectre v1 Takashi Iwai
2018-04-24 7:56 ` [PATCH 3/8] ALSA: control: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 4/8] ALSA: hda: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 5/8] ALSA: opl3: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 6/8] ALSA: asihpi: " Takashi Iwai
2018-04-24 7:56 ` [PATCH 7/8] ALSA: hdspm: " Takashi Iwai
2018-04-24 7:56 ` Takashi Iwai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180424075619.29602-9-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=dan.carpenter@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox