Parcourir la source

Merge tag 'vfio-v3.9-rc7' of git://github.com/awilliam/linux-vfio

Pull vfio overflow fix from Alex Williamson.

* tag 'vfio-v3.9-rc7' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Fix possible integer overflow
Linus Torvalds il y a 12 ans
Parent
commit
43ecdb0d31
1 fichiers modifiés avec 2 ajouts et 1 suppressions
  1. 2 1
      drivers/vfio/pci/vfio_pci.c

+ 2 - 1
drivers/vfio/pci/vfio_pci.c

@@ -346,6 +346,7 @@ static long vfio_pci_ioctl(void *device_data,
 
 
 		if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
 		if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
 			size_t size;
 			size_t size;
+			int max = vfio_pci_get_irq_count(vdev, hdr.index);
 
 
 			if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL)
 			if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL)
 				size = sizeof(uint8_t);
 				size = sizeof(uint8_t);
@@ -355,7 +356,7 @@ static long vfio_pci_ioctl(void *device_data,
 				return -EINVAL;
 				return -EINVAL;
 
 
 			if (hdr.argsz - minsz < hdr.count * size ||
 			if (hdr.argsz - minsz < hdr.count * size ||
-			    hdr.count > vfio_pci_get_irq_count(vdev, hdr.index))
+			    hdr.start >= max || hdr.start + hdr.count > max)
 				return -EINVAL;
 				return -EINVAL;
 
 
 			data = memdup_user((void __user *)(arg + minsz),
 			data = memdup_user((void __user *)(arg + minsz),