diff options
author | Jason Wang <jasowang@redhat.com> | 2018-10-30 02:10:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-31 15:39:15 -0400 |
commit | ff002269a4ee9c769dbf9365acef633ebcbd6cbe (patch) | |
tree | 4857add07b45c82cc591f888f6571d94a86dafb8 /drivers/vhost/vhost.c | |
parent | b1c234441e07da748ccded3aaa37177622d469d3 (diff) |
vhost: Fix Spectre V1 vulnerability
The idx in vhost_vring_ioctl() was controlled by userspace, hence a
potential exploitation of the Spectre variant 1 vulnerability.
Fixing this by sanitizing idx before using it to index d->vqs.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost/vhost.c')
-rw-r--r-- | drivers/vhost/vhost.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index f52008bb8df7..3a5f81a66d34 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/sched/mm.h> | 30 | #include <linux/sched/mm.h> |
31 | #include <linux/sched/signal.h> | 31 | #include <linux/sched/signal.h> |
32 | #include <linux/interval_tree_generic.h> | 32 | #include <linux/interval_tree_generic.h> |
33 | #include <linux/nospec.h> | ||
33 | 34 | ||
34 | #include "vhost.h" | 35 | #include "vhost.h" |
35 | 36 | ||
@@ -1387,6 +1388,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg | |||
1387 | if (idx >= d->nvqs) | 1388 | if (idx >= d->nvqs) |
1388 | return -ENOBUFS; | 1389 | return -ENOBUFS; |
1389 | 1390 | ||
1391 | idx = array_index_nospec(idx, d->nvqs); | ||
1390 | vq = d->vqs[idx]; | 1392 | vq = d->vqs[idx]; |
1391 | 1393 | ||
1392 | mutex_lock(&vq->mutex); | 1394 | mutex_lock(&vq->mutex); |