mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-31 14:23:49 +01:00
USB: usbfs: fix mmap dma mismatch
In commit2bef9aed6f("usb: usbfs: correct kernel->user page attribute mismatch") we switched from always calling remap_pfn_range() to call dma_mmap_coherent() to handle issues with systems with non-coherent USB host controller drivers. Unfortunatly, as syzbot quickly told us, not all the world is host controllers with DMA support, so we need to check what host controller we are attempting to talk to before doing this type of allocation. Thanks to Christoph for the quick idea of how to fix this. Fixes:2bef9aed6f("usb: usbfs: correct kernel->user page attribute mismatch") Cc: Christoph Hellwig <[email protected]> Cc: Hillf Danton <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Jeremy Linton <[email protected]> Cc: stable <[email protected]> Reported-by: [email protected] Reviewed-by: Jeremy Linton <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
1 parent
1449cb2c22
commit
a0e710a7de
1 file changed
+13
-3
@@ -251,9 +251,19 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
|
||||
usbm->vma_use_count = 1;
|
||||
INIT_LIST_HEAD(&usbm->memlist);
|
||||
|
||||
if (dma_mmap_coherent(hcd->self.sysdev, vma, mem, dma_handle, size)) {
|
||||
dec_usb_memory_use_count(usbm, &usbm->vma_use_count);
|
||||
return -EAGAIN;
|
||||
if (hcd->localmem_pool || !hcd_uses_dma(hcd)) {
|
||||
if (remap_pfn_range(vma, vma->vm_start,
|
||||
virt_to_phys(usbm->mem) >> PAGE_SHIFT,
|
||||
size, vma->vm_page_prot) < 0) {
|
||||
dec_usb_memory_use_count(usbm, &usbm->vma_use_count);
|
||||
return -EAGAIN;
|
||||
}
|
||||
} else {
|
||||
if (dma_mmap_coherent(hcd->self.sysdev, vma, mem, dma_handle,
|
||||
size)) {
|
||||
dec_usb_memory_use_count(usbm, &usbm->vma_use_count);
|
||||
return -EAGAIN;
|
||||
}
|
||||
}
|
||||
|
||||
vma->vm_flags |= VM_IO;
|
||||
|
||||
Reference in new issue
Block a user