]>
Commit | Line | Data |
---|---|---|
b468d7f8 GKH |
1 | From ea4039a34c4c206d015d34a49d0b00868e37db1d Mon Sep 17 00:00:00 2001 |
2 | From: Hillf Danton <dhillf@gmail.com> | |
3 | Date: Tue, 15 Nov 2011 14:36:12 -0800 | |
4 | Subject: hugetlb: release pages in the error path of hugetlb_cow() | |
5 | ||
6 | From: Hillf Danton <dhillf@gmail.com> | |
7 | ||
8 | commit ea4039a34c4c206d015d34a49d0b00868e37db1d upstream. | |
9 | ||
10 | If we fail to prepare an anon_vma, the {new, old}_page should be released, | |
11 | or they will leak. | |
12 | ||
13 | Signed-off-by: Hillf Danton <dhillf@gmail.com> | |
14 | Reviewed-by: Andrea Arcangeli <aarcange@redhat.com> | |
15 | Cc: Hugh Dickins <hughd@google.com> | |
16 | Cc: Johannes Weiner <jweiner@redhat.com> | |
17 | Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |
18 | Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | |
19 | Cc: Michal Hocko <mhocko@suse.cz> | |
20 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
21 | ||
22 | --- | |
23 | mm/hugetlb.c | 2 ++ | |
24 | 1 file changed, 2 insertions(+) | |
25 | ||
26 | --- a/mm/hugetlb.c | |
27 | +++ b/mm/hugetlb.c | |
28 | @@ -2422,6 +2422,8 @@ retry_avoidcopy: | |
29 | * anon_vma prepared. | |
30 | */ | |
31 | if (unlikely(anon_vma_prepare(vma))) { | |
32 | + page_cache_release(new_page); | |
33 | + page_cache_release(old_page); | |
34 | /* Caller expects lock to be held */ | |
35 | spin_lock(&mm->page_table_lock); | |
36 | return VM_FAULT_OOM; |