Merge tag 'v3.10.86' into update
authorStricted <info@stricted.net>
Wed, 21 Mar 2018 21:47:17 +0000 (22:47 +0100)
committerStricted <info@stricted.net>
Wed, 21 Mar 2018 21:47:17 +0000 (22:47 +0100)
This is the 3.10.86 stable release

1  2 
Makefile
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/storage/unusual_devs.h
mm/memory.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/memory.c
index 9feed4bfb32366d3356ba6dcc6390c748655ca75,30bf9cce8c2b046922a79a19b4a4ac046bb82f81..313d94a9ae260fcdf1d4da7de288b055171afd7d
@@@ -3533,11 -3498,10 +3533,14 @@@ static int do_linear_fault(struct mm_st
        pgoff_t pgoff = (((address & PAGE_MASK)
                        - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
  
 +      /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
 +      if (!vma->vm_ops->fault)
 +              return VM_FAULT_SIGBUS;
 +
        pte_unmap(page_table);
+       /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
+       if (!vma->vm_ops->fault)
+               return VM_FAULT_SIGBUS;
        return __do_fault(mm, vma, address, pmd, pgoff, flags, orig_pte);
  }