summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-09-11 14:22:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 15:58:03 -0700
commit1ecfd533f4c528b0b4cc5bc115c4c47f0b5e4828 (patch)
tree5eb1a6053fe7999323ed7238e6cb4993652b05c5
parent762216ab4e175f49d17bc7ad778c57b9028184e6 (diff)
downloadop-kernel-dev-1ecfd533f4c528b0b4cc5bc115c4c47f0b5e4828.zip
op-kernel-dev-1ecfd533f4c528b0b4cc5bc115c4c47f0b5e4828.tar.gz
mm/mremap.c: call pud_free() after fail calling pmd_alloc()
In alloc_new_pmd(), if pud_alloc() was called successfully, but pmd_alloc() fails, avoid leaking `pud'. Signed-off-by: Chen Gang <gang.chen@asianux.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/mremap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/mremap.c b/mm/mremap.c
index 0843feb..91b13d6 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -25,6 +25,7 @@
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
+#include <asm/pgalloc.h>
#include "internal.h"
@@ -62,8 +63,10 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
return NULL;
pmd = pmd_alloc(mm, pud, addr);
- if (!pmd)
+ if (!pmd) {
+ pud_free(mm, pud);
return NULL;
+ }
VM_BUG_ON(pmd_trans_huge(*pmd));
OpenPOWER on IntegriCloud