All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
	Dan Carpenter <dan.carpenter@oracle.com>
Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
	linux-renesas-soc@vger.kernel.org
Subject: [PATCH 06/11] rcar-v4l2: fix potential Spectre variant 1
Date: Mon, 23 Apr 2018 12:47:20 -0500	[thread overview]
Message-ID: <45621d4cd0639906cf16c4b4d666e8cd0e1c3694.1524499368.git.gustavo@embeddedor.com> (raw)
In-Reply-To: <cover.1524499368.git.gustavo@embeddedor.com>

f->index can be controlled by user-space, hence leading to
a potential exploitation of the Spectre variant 1 vulnerability.

Smatch warning:
drivers/media/platform/rcar-vin/rcar-v4l2.c:344 rvin_enum_fmt_vid_cap() warn: potential spectre issue 'rvin_formats'

Fix this by sanitizing f->index before using it to index
rvin_formats.

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
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index b479b88..bbfc3b8 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -22,6 +22,8 @@
 
 #include "rcar-vin.h"
 
+#include <linux/nospec.h>
+
 #define RVIN_DEFAULT_FORMAT	V4L2_PIX_FMT_YUYV
 #define RVIN_MAX_WIDTH		2048
 #define RVIN_MAX_HEIGHT		2048
@@ -340,7 +342,7 @@ static int rvin_enum_fmt_vid_cap(struct file *file, void *priv,
 {
 	if (f->index >= ARRAY_SIZE(rvin_formats))
 		return -EINVAL;
-
+	f->index = array_index_nospec(f->index, ARRAY_SIZE(rvin_formats));
 	f->pixelformat = rvin_formats[f->index].fourcc;
 
 	return 0;
-- 
2.7.4

  parent reply	other threads:[~2018-04-23 17:47 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-23 17:37 [PATCH 00/11] fix potential Spectre variant 1 issues Gustavo A. R. Silva
2018-04-23 17:37 ` Gustavo A. R. Silva
2018-04-23 17:38 ` [PATCH 01/11] media: tm6000: fix potential Spectre variant 1 Gustavo A. R. Silva
2018-04-23 18:24   ` Mauro Carvalho Chehab
2018-04-23 19:11     ` Gustavo A. R. Silva
2018-04-23 19:17       ` Mauro Carvalho Chehab
2018-04-23 19:22         ` Gustavo A. R. Silva
2018-04-26 21:41         ` Gustavo A. R. Silva
2018-04-26 23:42           ` Mauro Carvalho Chehab
2018-05-15  3:31             ` Gustavo A. R. Silva
2018-05-15 11:59               ` Mauro Carvalho Chehab
2018-05-15 14:16                 ` Dan Carpenter
2018-05-15 17:29                   ` Gustavo A. R. Silva
2018-05-15 19:00                     ` Mauro Carvalho Chehab
2018-05-16 13:11                       ` Dan Carpenter
2018-05-16 13:36                         ` Mauro Carvalho Chehab
2018-05-15 19:39                     ` Dan Carpenter
2018-05-17  1:14                       ` Gustavo A. R. Silva
2018-05-17 10:36                         ` Gustavo A. R. Silva
2018-05-17 11:34                           ` Mauro Carvalho Chehab
2018-05-17 11:43                             ` Mauro Carvalho Chehab
2018-05-17 12:13                               ` Mauro Carvalho Chehab
2018-05-17 18:08                                 ` Gustavo A. R. Silva
2018-05-21 16:18                                   ` Gustavo A. R. Silva
2018-04-24  9:35     ` Dan Carpenter
2018-04-24 10:11       ` Mauro Carvalho Chehab
2018-04-24 10:36       ` Peter Zijlstra
2018-04-24 11:21         ` Peter Zijlstra
2018-04-24 17:47         ` Mauro Carvalho Chehab
2018-04-24 18:48           ` Peter Zijlstra
2018-04-23 17:38 ` [PATCH 02/11] exynos4-is: mipi-csis: " Gustavo A. R. Silva
2018-04-23 17:38   ` Gustavo A. R. Silva
2018-04-23 17:39 ` [PATCH 03/11] fsl-viu: " Gustavo A. R. Silva
2018-04-23 17:40 ` [PATCH 04/11] marvell-ccic: mcam-core: " Gustavo A. R. Silva
2018-04-23 17:41 ` [PATCH 05/11] omap_vout: " Gustavo A. R. Silva
2018-04-23 17:47 ` Gustavo A. R. Silva [this message]
2018-04-23 17:48 ` [PATCH 07/11] rcar_drif: " Gustavo A. R. Silva
2018-04-23 17:48 ` [PATCH 08/11] sh_vou: " Gustavo A. R. Silva
2018-04-23 17:50 ` [PATCH 09/11] vimc-debayer: " Gustavo A. R. Silva
2018-04-23 17:51 ` [PATCH 10/11] vivid-sdr-cap: " Gustavo A. R. Silva
2018-04-23 17:52 ` [PATCH 11/11] vsp1_rwpf: " Gustavo A. R. Silva
2018-04-23 19:13 ` [PATCH 00/11] fix potential Spectre variant 1 issues Gustavo A. R. Silva
2018-04-23 19:13   ` Gustavo A. R. Silva

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=45621d4cd0639906cf16c4b4d666e8cd0e1c3694.1524499368.git.gustavo@embeddedor.com \
    --to=gustavo@embeddedor.com \
    --cc=dan.carpenter@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=niklas.soderlund@ragnatech.se \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.