From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: Re: [PATCH] vfio/pci: Fix potential Spectre v1 Date: Wed, 18 Jul 2018 14:33:36 -0600 Message-ID: <20180718143336.103279e1@t450s.home> References: <20180717173900.GA24627@embeddedor.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org To: "Gustavo A. R. Silva" Return-path: In-Reply-To: <20180717173900.GA24627@embeddedor.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Tue, 17 Jul 2018 12:39:00 -0500 "Gustavo A. R. Silva" wrote: > info.index can be indirectly controlled by user-space, hence leading > to a potential exploitation of the Spectre variant 1 vulnerability. > > This issue was detected with the help of Smatch: > > drivers/vfio/pci/vfio_pci.c:734 vfio_pci_ioctl() > warn: potential spectre issue 'vdev->region' > > Fix this by sanitizing info.index before indirectly using it to index > vdev->region > > Notice that given that speculation windows are large, the policy is > to kill the speculation on the first load and not worry if it can be > completed with a dependent load/store [1]. > > [1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 > > Cc: stable@vger.kernel.org > Signed-off-by: Gustavo A. R. Silva > --- > drivers/vfio/pci/vfio_pci.c | 4 ++++ > 1 file changed, 4 insertions(+) Applied to vfio for-linus branch for v4.18. Thanks! Alex > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index b423a30..125b58e 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -28,6 +28,7 @@ > #include > #include > #include > +#include > > #include "vfio_pci_private.h" > > @@ -727,6 +728,9 @@ static long vfio_pci_ioctl(void *device_data, > if (info.index >= > VFIO_PCI_NUM_REGIONS + vdev->num_regions) > return -EINVAL; > + info.index = array_index_nospec(info.index, > + VFIO_PCI_NUM_REGIONS + > + vdev->num_regions); > > i = info.index - VFIO_PCI_NUM_REGIONS; >