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>
This commit is contained in:
Jason Wang 2018-10-30 14:10:49 +08:00 committed by David S. Miller
parent b1c234441e
commit ff002269a4
1 changed files with 2 additions and 0 deletions

View File

@ -30,6 +30,7 @@
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
#include <linux/interval_tree_generic.h> #include <linux/interval_tree_generic.h>
#include <linux/nospec.h>
#include "vhost.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) if (idx >= d->nvqs)
return -ENOBUFS; return -ENOBUFS;
idx = array_index_nospec(idx, d->nvqs);
vq = d->vqs[idx]; vq = d->vqs[idx];
mutex_lock(&vq->mutex); mutex_lock(&vq->mutex);