Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48e5aee8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v4.18-rc6' of git://github.com/awilliam/linux-vfio 

Pull VFIO fix from Alex Williamson:
 "Harden potential Spectre v1 issue (Gustavo A. R. Silva)"

* tag 'vfio-v4.18-rc6' of git://github.com/awilliam/linux-vfio:
  vfio/pci: Fix potential Spectre v1
parents b4460a95 0e714d27

drivers/vfio/pci/vfio_pci.c

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/uaccess.h>

#include <linux/vfio.h>

#include <linux/vgaarb.h>

#include <linux/nospec.h>



#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;