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

Commit 3c2a9f84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-for-v3.8-rc5' of git://github.com/awilliam/linux-vfio 

Pull vfio fix from Alex Williamson.
 "vfio-pci: Fix buffer overfill"

* tag 'vfio-for-v3.8-rc5' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Fix buffer overfill
parents d26d4525 ec1287e5

drivers/vfio/pci/vfio_pci_rdwr.c

+2 −2
Original line number Diff line number Diff line
@@ -240,17 +240,17 @@ ssize_t vfio_pci_mem_readwrite(struct vfio_pci_device *vdev, char __user *buf, 
			filled = 1;

		} else {

			/* Drop writes, fill reads with FF */

			filled = min((size_t)(x_end - pos), count);

			if (!iswrite) {

				char val = 0xFF;

				size_t i;



				for (i = 0; i < x_end - pos; i++) {

				for (i = 0; i < filled; i++) {

					if (put_user(val, buf + i))

						goto out;

				}

			}



			filled = x_end - pos;

		}



		count -= filled;