From patchwork Fri Jun 29 15:14:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09/11] ubi: fastmap: Do not free 'ai' in 'scan_all()' Date: Fri, 29 Jun 2012 05:14:27 -0000 From: Richard Weinberger X-Patchwork-Id: 168137 Message-Id: <1340982869-77042-10-git-send-email-richard@nod.at> To: linux-mtd@lists.infradead.org Cc: nyoushchenko@mvista.com, artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de, shmulik.ladkani@gmail.com, Richard Weinberger , tglx@linutronix.de, Marius.Mazarel@ugal.ro, tim.bird@am.sony.com From: Shmulik Ladkani Do not call 'destroy_ai(ai)' at error handling of 'scan_all', since: - 'ai' is allocated in 'ubi_attach' (the caller of scan_all) and provided as an argument. It's not scan_all's responsibility to free it - It is not consistent with scan_all's sister function 'ubi_attach_fastmap()' which does not free the given 'ai' - It will cause a double free as 'ubi_attach' (the caller of scan_all) already destroys 'ai' in case of an error Signed-off-by: Shmulik Ladkani Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/attach.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index c30a0f6..a343a41 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1237,7 +1237,7 @@ static int scan_all(struct ubi_device *ubi, struct ubi_attach_info *ai, int star ech = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL); if (!ech) - goto out_ai; + return err; vidh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL); if (!vidh) @@ -1298,8 +1298,6 @@ out_vidh: ubi_free_vid_hdr(ubi, vidh); out_ech: kfree(ech); -out_ai: - destroy_ai(ai); return err; }