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

Commit 6bec009a authored by David Woodhouse's avatar David Woodhouse Committed by Greg Kroah-Hartman
Browse files

PCI: Fix another sanity check bug in /proc/pci mmap 



commit 17caf56731311c9596e7d38a70c88fcb6afa6a1b upstream.

Don't match MMIO maps with I/O BARs and vice versa.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa3bbb1c

drivers/pci/proc.c

+8 −2
Original line number Diff line number Diff line
@@ -231,14 +231,20 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) 
{

	struct pci_dev *dev = PDE_DATA(file_inode(file));

	struct pci_filp_private *fpriv = file->private_data;

	int i, ret, write_combine;

	int i, ret, write_combine, res_bit;



	if (!capable(CAP_SYS_RAWIO))

		return -EPERM;



	if (fpriv->mmap_state == pci_mmap_io)

		res_bit = IORESOURCE_IO;

	else

		res_bit = IORESOURCE_MEM;



	/* Make sure the caller is mapping a real resource for this device */

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

		if (pci_mmap_fits(dev, i, vma,  PCI_MMAP_PROCFS))

		if (dev->resource[i].flags & res_bit &&

		    pci_mmap_fits(dev, i, vma,  PCI_MMAP_PROCFS))

			break;

	}