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

Commit bdbd01ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fix offset check for sysfs mmapped files
parents 2ebc8ec8 8c05cd08

drivers/pci/pci-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma, 
	nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;

	start = vma->vm_pgoff;

	size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1;

	pci_start = (mmap_api == PCI_MMAP_SYSFS) ?

	pci_start = (mmap_api == PCI_MMAP_PROCFS) ?

			pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0;

	if (start >= pci_start && start < pci_start + size &&

			start + nr <= pci_start + size)