tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds bdbd01ac 2ebc8ec8

+1 -1
unified split
+1 -1
drivers/pci/pci-sysfs.c
··· 715 nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 716 start = vma->vm_pgoff; 717 size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1; 718 - pci_start = (mmap_api == PCI_MMAP_SYSFS) ? 719 pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0; 720 if (start >= pci_start && start < pci_start + size && 721 start + nr <= pci_start + size)
··· 715 nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 716 start = vma->vm_pgoff; 717 size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1; 718 + pci_start = (mmap_api == PCI_MMAP_PROCFS) ? 719 pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0; 720 if (start >= pci_start && start < pci_start + size && 721 start + nr <= pci_start + size)