diff options
author | Roman Gushchin <klamm@yandex-team.ru> | 2015-02-11 18:28:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 20:06:07 -0500 |
commit | 8138a67a5557ffea3a21dfd6f037842d4e748513 (patch) | |
tree | 437e800e5cead199af4ac5512e5b42c8ff61900b | |
parent | 5703b087dc8eaf47bfb399d6cf512d471beff405 (diff) |
mm/nommu.c: fix arithmetic overflow in __vm_enough_memory()
I noticed that "allowed" can easily overflow by falling below 0, because
(total_vm / 32) can be larger than "allowed". The problem occurs in
OVERCOMMIT_NONE mode.
In this case, a huge allocation can success and overcommit the system
(despite OVERCOMMIT_NONE mode). All subsequent allocations will fall
(system-wide), so system become unusable.
The problem was masked out by commit c9b1d0981fcc
("mm: limit growth of 3% hardcoded other user reserve"),
but it's easy to reproduce it on older kernels:
1) set overcommit_memory sysctl to 2
2) mmap() large file multiple times (with VM_SHARED flag)
3) try to malloc() large amount of memory
It also can be reproduced on newer kernels, but miss-configured
sysctl_user_reserve_kbytes is required.
Fix this issue by switching to signed arithmetic here.
Signed-off-by: Roman Gushchin <klamm@yandex-team.ru>
Cc: Andrew Shewmaker <agshew@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 4d1b8a199867..1a19fb3b0463 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1928,7 +1928,7 @@ EXPORT_SYMBOL(unmap_mapping_range); | |||
1928 | */ | 1928 | */ |
1929 | int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) | 1929 | int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) |
1930 | { | 1930 | { |
1931 | unsigned long free, allowed, reserve; | 1931 | long free, allowed, reserve; |
1932 | 1932 | ||
1933 | vm_acct_memory(pages); | 1933 | vm_acct_memory(pages); |
1934 | 1934 | ||
@@ -1992,7 +1992,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) | |||
1992 | */ | 1992 | */ |
1993 | if (mm) { | 1993 | if (mm) { |
1994 | reserve = sysctl_user_reserve_kbytes >> (PAGE_SHIFT - 10); | 1994 | reserve = sysctl_user_reserve_kbytes >> (PAGE_SHIFT - 10); |
1995 | allowed -= min(mm->total_vm / 32, reserve); | 1995 | allowed -= min_t(long, mm->total_vm / 32, reserve); |
1996 | } | 1996 | } |
1997 | 1997 | ||
1998 | if (percpu_counter_read_positive(&vm_committed_as) < allowed) | 1998 | if (percpu_counter_read_positive(&vm_committed_as) < allowed) |