linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jinbum Park <jinb.park7@gmail.com>
To: axboe@kernel.dk, bart.vanassche@wdc.com, jiufei.xue@linux.alibaba.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] pktcdvd: Fix possible Spectre-v1 for pkt_devs
Date: Sat, 28 Jul 2018 10:31:51 +0900	[thread overview]
Message-ID: <20180728013151.GA15457@pjb1027-Latitude-E5410> (raw)

User controls @dev_minor which to be used as index of pkt_devs.
So, It can be exploited via Spectre-like attack. (speculative execution)

This kind of attack leaks address of pkt_devs, [1]
It leads an attacker to bypass security mechanism such as KASLR.

So sanitize @dev_minor before using it to prevent attack.

[1] https://github.com/jinb-park/linux-exploit/
tree/master/exploit-remaining-spectre-gadget/leak_pkt_devs.c

Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
---
 drivers/block/pktcdvd.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index c61d20c..665760d 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -67,8 +67,8 @@
 #include <scsi/scsi.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
-
 #include <linux/uaccess.h>
+#include <linux/nospec.h>
 
 #define DRIVER_NAME	"pktcdvd"
 
@@ -2229,9 +2229,13 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)
 
 static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor)
 {
+	unsigned int idx = 0;
+
 	if (dev_minor >= MAX_WRITERS)
 		return NULL;
-	return pkt_devs[dev_minor];
+
+	idx = array_index_nospec(dev_minor, MAX_WRITERS);
+	return pkt_devs[idx];
 }
 
 static int pkt_open(struct block_device *bdev, fmode_t mode)
-- 
1.9.1


             reply	other threads:[~2018-07-28  1:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-28  1:31 Jinbum Park [this message]
2018-07-28  1:47 ` [PATCH] pktcdvd: Fix possible Spectre-v1 for pkt_devs 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=20180728013151.GA15457@pjb1027-Latitude-E5410 \
    --to=jinb.park7@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=bart.vanassche@wdc.com \
    --cc=jiufei.xue@linux.alibaba.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).