tree 567165f302089d01697de7e9a41e9cf209d300d6
parent 1751a09d6fd9c10460d09810a756ace3c7643a6e
author Dmitry Safonov <dima@arista.com> 1608001689 -0800
committer Tim Zimmermann <tim@linux4.de> 1721966657 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuwYxAyE4TRnuhLgPbcIaY/gZxe8FAmajIEEACgkQbcIaY/gZ
 xe/qTQ/+O7sAgMadO/NeRX6P+blp7XZtVSxQeROJnYjkSkCibUIgx75Fw+pEqAAD
 T+yYriNNpVT1RhAtbhREfx9wQabrmRLOmtWDbs/bzL5uQOHNuav+iTL9YXH/UmqQ
 fUb24fcu8dpMZHNnTZQLBVWbxE9nMKOn/jya8H75iZbGC1LSLmWY9ZXseZh9tyxM
 QeXOreJPqh66RWJgNgpKcSGEDigc5DIzDj9g+1YDj6wtPRD9oVXe+ZhzsL2h4YTC
 lbRHiIsSerTcm7fxlsjXsybYt4kf9R4p2xbU9l+qNGs3G+7ZBq9VsmEHM43Ch3A5
 3sePjDI4RJrt6CbYq69JgDdDGKIHN5v+b7qevARMerv5TR3OJWWTJ/y+Y3jS8fm7
 081zFTbB6kmam4zI2ZeQSTKUzoMdkP1aXF0QNiCjMBNRG40XCRWDNA5fIahStkdO
 hJ/lLMSUswTtnt/lJVFQECa6vV/TVRAS2xNdLKRAC2eB0i2CMngW4mvBFX9XutT5
 Clh23gvzSyYqHAb/FKVtaKkjydddpNzoxBsK9PsGpeWleHk7kv7EyblSSfhPAkmQ
 qXdifq03oVjj7Ri9u6GKqdMXFWb9JAW70xPoJt5PhILCxP5xsHOLsjMAeNadJm42
 zDdkQKTgmaSZez+Ds4+5HsScjrRS72qwn5ALcODp0xI7CzaaMU4=
 =ajS/
 -----END PGP SIGNATURE-----

BACKPORT: mm/mremap: for MREMAP_DONTUNMAP check security_vm_enough_memory_mm()

Currently memory is accounted post-mremap() with MREMAP_DONTUNMAP, which
may break overcommit policy.  So, check if there's enough memory before
doing actual VMA copy.

Don't unset VM_ACCOUNT on MREMAP_DONTUNMAP.  By semantics, such mremap()
is actually a memory allocation.  That also simplifies the error-path a
little.

Also, as it's memory allocation on success don't reset hiwater_vm value.

Link: https://lkml.kernel.org/r/20201013013416.390574-3-dima@arista.com
Fixes: commit e346b3813067 ("mm/mremap: add MREMAP_DONTUNMAP to mremap()")
Signed-off-by: Dmitry Safonov <dima@arista.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Geffon <bgeffon@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit ad8ee77ea9db1f74fe79c285e3546375efa75608)

[Kalesh Singh: Resolve conflicts in mm/mremap.c]
Bug: 176847609
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
Change-Id: If8e8bf5a18d16ed6b40af22a685951698e6f444c