diff options
| author |   Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2015-07-13 11:32:43 +0200 |
|---|---|---|
| committer |   Helge Deller <deller@gmx.de> | 2015-07-19 08:56:14 +0200 |
| commit | 4c4ac9a48ac512c6b5a6cca06cfad2ad96e8caaa (patch) | |
| tree | 7e721e9391aafea6b902fb25d65ce967d910c35e /arch | |
| parent | Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (diff) | |
| download | linux-dev-4c4ac9a48ac512c6b5a6cca06cfad2ad96e8caaa.tar.xz linux-dev-4c4ac9a48ac512c6b5a6cca06cfad2ad96e8caaa.zip | |
parisc: mm: Fix a memory leak related to pmd not attached to the pgd
Commit 0e0da48dee8d ("parisc: mm: don't count preallocated pmds")
introduced a memory leak.
After this commit, the 'return' statement in pmd_free is executed in all
cases. Even for pmd that are not attached to the pgd. So 'free_pages'
can never be called anymore, leading to a memory leak.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Mikulas Patocka <mpatocka@redhat.com>
Acked-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/include/asm/pgalloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h index 3a08eae3318f..3edbb9fc91b4 100644 --- a/arch/parisc/include/asm/pgalloc.h +++ b/arch/parisc/include/asm/pgalloc.h @@ -72,7 +72,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) { - if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED) + if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) { /* * This is the permanent pmd attached to the pgd; * cannot free it. @@ -81,6 +81,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) */ mm_inc_nr_pmds(mm); return; + } free_pages((unsigned long)pmd, PMD_ORDER); } |