lkml.org 
[lkml]   [2012]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] ARM: dma-mapping: fix leak in consistent_init
Date
Although the error in this case is unlikely, but logically
if error occurs then we leak memory.

Signed-off-by: Ajeet Yadav <ajeet.yadav.77@gmail.com>
---
arch/arm/mm/dma-mapping.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 04bfa76..932d288 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -161,7 +161,6 @@ static struct arm_vmregion_head consistent_head = {
*/
static int __init consistent_init(void)
{
- int ret = 0;
pgd_t *pgd;
pud_t *pud;
pmd_t *pmd;
@@ -185,30 +184,31 @@ static int __init consistent_init(void)
pud = pud_alloc(&init_mm, pgd, base);
if (!pud) {
printk(KERN_ERR "%s: no pud tables\n", __func__);
- ret = -ENOMEM;
- break;
+ goto err;
}

pmd = pmd_alloc(&init_mm, pud, base);
if (!pmd) {
printk(KERN_ERR "%s: no pmd tables\n", __func__);
- ret = -ENOMEM;
- break;
+ goto err;
}
WARN_ON(!pmd_none(*pmd));

pte = pte_alloc_kernel(pmd, base);
if (!pte) {
printk(KERN_ERR "%s: no pte tables\n", __func__);
- ret = -ENOMEM;
- break;
+ goto err;
}

consistent_pte[i++] = pte;
base += PMD_SIZE;
} while (base < CONSISTENT_END);

- return ret;
+ return 0;
+err:
+ kfree(consistent_pte);
+ consistent_pte = NULL;
+ return -ENOMEM;
}

core_initcall(consistent_init);
--
1.7.8.4


\
 
 \ /
  Last update: 2012-02-17 14:29    [W:0.040 / U:5.632 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site