diff options
| author |   Jason Wang <jasowang@redhat.com> | 2018-10-30 14:10:49 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-10-31 12:39:15 -0700 |
| commit | ff002269a4ee9c769dbf9365acef633ebcbd6cbe (patch) | |
| tree | 4857add07b45c82cc591f888f6571d94a86dafb8 /drivers/vhost | |
| parent | net: drop a space before tabs (diff) | |
| download | linux-dev-ff002269a4ee9c769dbf9365acef633ebcbd6cbe.tar.xz linux-dev-ff002269a4ee9c769dbf9365acef633ebcbd6cbe.zip | |
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')
| -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 @@ #include <linux/sched/mm.h> #include <linux/sched/signal.h> #include <linux/interval_tree_generic.h> +#include <linux/nospec.h> #include "vhost.h" @@ -1387,6 +1388,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg if (idx >= d->nvqs) return -ENOBUFS; + idx = array_index_nospec(idx, d->nvqs); vq = d->vqs[idx]; mutex_lock(&vq->mutex); |