mm/mmap: Use vms accounted pages in mmap_region()
Subsystems (3)
PATCH 16/19 mm/mmap: Use vms accounted pages in mmap_region()
Change from nr_pages variable to vms.nr_accounted for the charged pages calculation. This is necessary for a future patch.
This also avoids checking security_vm_enough_memory_mm() if the amount of memory won't change.
Signed-off-by Liam R. Howlett <[email protected]>
Cc Kees Cook <[email protected]>
Reviewed-by Kees Cook <[email protected]>
Reviewed-by Lorenzo Stoakes <[email protected]>
Reviewed-by Suren Baghdasaryan <[email protected]>
--- mm/mmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/mmap.c +3 -2
@@ -1416,9 +1416,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,*/ if (accountable_mapping (file, vm_flags)) { charged = pglen; - charged -= nr_accounted; -if (security_vm_enough_memory_mm (mm, charged)) + charged -= vms.nr_accounted; +if (charged &&security_vm_enough_memory_mm (mm, charged)) goto abort_munmap; + vms.nr_accounted =0 ; vm_flags |=VM_ACCOUNT ; }
--
2.45.2