Patchwork ubi: fastmap: Do not free 'ai' in 'scan_all()'

login
register
mail settings
Submitter Shmulik Ladkani
Date June 28, 2012, 2:45 p.m.
Message ID <20120628174546.491954e2@pixies.home.jungo.com>
Download mbox | patch
Permalink /patch/167892/
State New
Headers show

Comments

Shmulik Ladkani - June 28, 2012, 2:45 p.m.
From: Shmulik Ladkani <shmulik.ladkani@gmail.com>

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 <shmulik.ladkani@gmail.com>
---
- compile tested
Richard Weinberger - June 29, 2012, 11:20 a.m.
Am Thu, 28 Jun 2012 17:45:46 +0300
schrieb Shmulik Ladkani <shmulik.ladkani@gmail.com>:

> From: Shmulik Ladkani <shmulik.ladkani@gmail.com>
> 
> 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 <shmulik.ladkani@gmail.com>
> ---

Applied!

Thanks,
//richard

Patch

diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 019fbd3..8a339e4 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -1152,11 +1152,11 @@  static int scan_all(struct ubi_device *ubi, struct ubi_attach_info *ai)
 					       sizeof(struct ubi_ainf_peb),
 					       0, 0, NULL);
 	if (!ai->aeb_slab_cache)
-		goto out_ai;
+		return -ENOMEM;
 
 	ech = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL);
 	if (!ech)
-		goto out_ai;
+		return -ENOMEM;
 
 	vidh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL);
 	if (!vidh)
@@ -1218,8 +1218,6 @@  out_vidh:
 	ubi_free_vid_hdr(ubi, vidh);
 out_ech:
 	kfree(ech);
-out_ai:
-	destroy_ai(ai);
 	return err;
 }