Merge tag 'v5.2-rc6' into for-5.3/block

Merge 5.2-rc6 into for-5.3/block, so we get the same page merge leak
fix. Otherwise we end up having conflicts with future patches between
for-5.3/block and master that touch this area. In particular, it makes
the bio_full() fix hard to backport to stable.

* tag 'v5.2-rc6': (482 commits)
  Linux 5.2-rc6
  Revert "iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock"
  Bluetooth: Fix regression with minimum encryption key size alignment
  tcp: refine memory limit test in tcp_fragment()
  x86/vdso: Prevent segfaults due to hoisted vclock reads
  SUNRPC: Fix a credential refcount leak
  Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE"
  net :sunrpc :clnt :Fix xps refcount imbalance on the error path
  NFS4: Only set creation opendata if O_CREAT
  ARM: 8867/1: vdso: pass --be8 to linker if necessary
  KVM: nVMX: reorganize initial steps of vmx_set_nested_state
  KVM: PPC: Book3S HV: Invalidate ERAT when flushing guest TLB entries
  habanalabs: use u64_to_user_ptr() for reading user pointers
  nfsd: replace Jeff by Chuck as nfsd co-maintainer
  inet: clear num_timeout reqsk_alloc()
  PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present
  net: mvpp2: debugfs: Add pmap to fs dump
  ipv6: Default fib6_type to RTN_UNICAST when not set
  net: hns3: Fix inconsistent indenting
  net/af_iucv: always register net_device notifier
  ...

1 files changed, 8 insertions, 6 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 7350a124524b..4c9e150e5ad3 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2123,9 +2123,9 @@ static inline void set_area_direct_map(const struct vm_struct *area,
 /* Handle removing and resetting vm mappings related to the vm_struct. */
 static void vm_remove_mappings(struct vm_struct *area, int deallocate_pages)
 {
-        unsigned long addr = (unsigned long)area->addr;
         unsigned long start = ULONG_MAX, end = 0;
         int flush_reset = area->flags & VM_FLUSH_RESET_PERMS;
+        int flush_dmap = 0;
         int i;
 
         /*
@@ -2135,8 +2135,8 @@ static void vm_remove_mappings(struct vm_struct *area, int deallocate_pages)
          * execute permissions, without leaving a RW+X window.
          */
         if (flush_reset && !IS_ENABLED(CONFIG_ARCH_HAS_SET_DIRECT_MAP)) {
-                set_memory_nx(addr, area->nr_pages);
-                set_memory_rw(addr, area->nr_pages);
+                set_memory_nx((unsigned long)area->addr, area->nr_pages);
+                set_memory_rw((unsigned long)area->addr, area->nr_pages);
         }
 
         remove_vm_area(area->addr);
@@ -2160,9 +2160,11 @@ static void vm_remove_mappings(struct vm_struct *area, int deallocate_pages)
          * the vm_unmap_aliases() flush includes the direct map.
          */
         for (i = 0; i < area->nr_pages; i++) {
-                if (page_address(area->pages[i])) {
+                unsigned long addr = (unsigned long)page_address(area->pages[i]);
+                if (addr) {
                         start = min(addr, start);
-                        end = max(addr, end);
+                        end = max(addr + PAGE_SIZE, end);
+                        flush_dmap = 1;
                 }
         }
 
@@ -2172,7 +2174,7 @@ static void vm_remove_mappings(struct vm_struct *area, int deallocate_pages)
          * reset the direct map permissions to the default.
          */
         set_area_direct_map(area, set_direct_map_invalid_noflush);
-        _vm_unmap_aliases(start, end, 1);
+        _vm_unmap_aliases(start, end, flush_dmap);
         set_area_direct_map(area, set_direct_map_default_noflush);
 }