| Message ID | 20130117132843.GD25615@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Reviewed-by: Richard Mortimer <richm@oldelvet.org.uk> On 17/01/2013 13:28, Cong Ding wrote: > The variable iommu and strbuf are not freed properly if it goes to error. > > Signed-off-by: Cong Ding <dinggnu@gmail.com> > --- > arch/sparc/kernel/sbus.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c > index 1271b3a..be5bdf9 100644 > --- a/arch/sparc/kernel/sbus.c > +++ b/arch/sparc/kernel/sbus.c > @@ -554,10 +554,8 @@ static void __init sbus_iommu_init(struct platform_device *op) > regs = pr->phys_addr; > > iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC); > - if (!iommu) > - goto fatal_memory_error; > strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC); > - if (!strbuf) > + if (!iommu || !strbuf) > goto fatal_memory_error; > > op->dev.archdata.iommu = iommu; > @@ -656,6 +654,8 @@ static void __init sbus_iommu_init(struct platform_device *op) > return; > > fatal_memory_error: > + kfree(iommu); > + kfree(strbuf); > prom_printf("sbus_iommu_init: Fatal memory allocation error.\n"); > } > > -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Richard Mortimer <richm@oldelvet.org.uk> Date: Mon, 21 Jan 2013 22:20:36 +0000 > Reviewed-by: Richard Mortimer <richm@oldelvet.org.uk> > > On 17/01/2013 13:28, Cong Ding wrote: >> The variable iommu and strbuf are not freed properly if it goes to >> error. >> >> Signed-off-by: Cong Ding <dinggnu@gmail.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c index 1271b3a..be5bdf9 100644 --- a/arch/sparc/kernel/sbus.c +++ b/arch/sparc/kernel/sbus.c @@ -554,10 +554,8 @@ static void __init sbus_iommu_init(struct platform_device *op) regs = pr->phys_addr; iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC); - if (!iommu) - goto fatal_memory_error; strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC); - if (!strbuf) + if (!iommu || !strbuf) goto fatal_memory_error; op->dev.archdata.iommu = iommu; @@ -656,6 +654,8 @@ static void __init sbus_iommu_init(struct platform_device *op) return; fatal_memory_error: + kfree(iommu); + kfree(strbuf); prom_printf("sbus_iommu_init: Fatal memory allocation error.\n"); }
The variable iommu and strbuf are not freed properly if it goes to error. Signed-off-by: Cong Ding <dinggnu@gmail.com> --- arch/sparc/kernel/sbus.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)