pktcdvd: Fix possible Spectre-v1 for pkt_devs
authorJinbum Park <jinb.park7@gmail.com>
Sat, 28 Jul 2018 04:20:44 +0000 (13:20 +0900)
committerJens Axboe <axboe@kernel.dk>
Sat, 28 Jul 2018 15:08:42 +0000 (09:08 -0600)
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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/pktcdvd.c

index a4b4d524c3af7d4c421097322fd74e0f61902aaa..9bb7721c26fc2fcc0cf194efa3616189b21fcd8f 100644 (file)
@@ -67,7 +67,7 @@
 #include <scsi/scsi.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
-
+#include <linux/nospec.h>
 #include <linux/uaccess.h>
 
 #define DRIVER_NAME    "pktcdvd"
@@ -2254,6 +2254,8 @@ static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor)
 {
        if (dev_minor >= MAX_WRITERS)
                return NULL;
+
+       dev_minor = array_index_nospec(dev_minor, MAX_WRITERS);
        return pkt_devs[dev_minor];
 }