Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac46148c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UBI: Fastmap: Fix memory leak while attaching"

parents ed88c28d 8949654f

drivers/mtd/ubi/attach.c

+33 −28
Original line number Diff line number Diff line
@@ -1297,6 +1297,30 @@ out_ech: 
	return err;

}



static struct ubi_attach_info *alloc_ai(const char *slab_name)

{

	struct ubi_attach_info *ai;



	ai = kzalloc(sizeof(struct ubi_attach_info), GFP_KERNEL);

	if (!ai)

		return ai;



	INIT_LIST_HEAD(&ai->corr);

	INIT_LIST_HEAD(&ai->free);

	INIT_LIST_HEAD(&ai->erase);

	INIT_LIST_HEAD(&ai->alien);

	ai->volumes = RB_ROOT;

	ai->aeb_slab_cache = kmem_cache_create(slab_name,

					       sizeof(struct ubi_ainf_peb),

					       0, 0, NULL);

	if (!ai->aeb_slab_cache) {

		kfree(ai);

		ai = NULL;

	}



	return ai;

}



#ifdef CONFIG_MTD_UBI_FASTMAP



/**
@@ -1309,7 +1333,7 @@ out_ech: 
 * UBI_NO_FASTMAP denotes that no fastmap was found.

 * UBI_BAD_FASTMAP denotes that the found fastmap was invalid.

 */

static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info *ai)

static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info **ai)

{

	int err, pnum, fm_anchor = -1;

	unsigned long long max_sqnum = 0;
@@ -1330,7 +1354,7 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info *ai) 
		cond_resched();



		dbg_gen("process PEB %d", pnum);

		err = scan_peb(ubi, ai, pnum, &vol_id, &sqnum);

		err = scan_peb(ubi, *ai, pnum, &vol_id, &sqnum);

		if (err < 0)

			goto out_vidh;
@@ -1346,7 +1370,12 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info *ai) 
	if (fm_anchor < 0)

		return UBI_NO_FASTMAP;



	return ubi_scan_fastmap(ubi, ai, fm_anchor);

	destroy_ai(*ai);

	*ai = alloc_ai("ubi_aeb_slab_cache");

	if (!*ai)

		return -ENOMEM;



	return ubi_scan_fastmap(ubi, *ai, fm_anchor);



out_vidh:

	ubi_free_vid_hdr(ubi, vidh);
@@ -1358,30 +1387,6 @@ out: 


#endif



static struct ubi_attach_info *alloc_ai(const char *slab_name)

{

	struct ubi_attach_info *ai;



	ai = kzalloc(sizeof(struct ubi_attach_info), GFP_KERNEL);

	if (!ai)

		return ai;



	INIT_LIST_HEAD(&ai->corr);

	INIT_LIST_HEAD(&ai->free);

	INIT_LIST_HEAD(&ai->erase);

	INIT_LIST_HEAD(&ai->alien);

	ai->volumes = RB_ROOT;

	ai->aeb_slab_cache = kmem_cache_create(slab_name,

					       sizeof(struct ubi_ainf_peb),

					       0, 0, NULL);

	if (!ai->aeb_slab_cache) {

		kfree(ai);

		ai = NULL;

	}



	return ai;

}



/**

 * ubi_attach - attach an MTD device.

 * @ubi: UBI device descriptor
@@ -1409,7 +1414,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) 
	if (force_scan)

		err = scan_all(ubi, ai, 0);

	else {

		err = scan_fast(ubi, ai);

		err = scan_fast(ubi, &ai);

		if (err > 0) {

			if (err != UBI_NO_FASTMAP) {

				destroy_ai(ai);

drivers/mtd/ubi/fastmap.c

+0 −13
Original line number Diff line number Diff line
@@ -561,21 +561,8 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
	INIT_LIST_HEAD(&used);

	INIT_LIST_HEAD(&free);

	INIT_LIST_HEAD(&eba_orphans);

	INIT_LIST_HEAD(&ai->corr);

	INIT_LIST_HEAD(&ai->free);

	INIT_LIST_HEAD(&ai->erase);

	INIT_LIST_HEAD(&ai->alien);

	ai->volumes = RB_ROOT;

	ai->min_ec = UBI_MAX_ERASECOUNTER;



	ai->aeb_slab_cache = kmem_cache_create("ubi_ainf_peb_slab",

					       sizeof(struct ubi_ainf_peb),

					       0, 0, NULL);

	if (!ai->aeb_slab_cache) {

		ret = -ENOMEM;

		goto fail;

	}



	fmsb = (struct ubi_fm_sb *)(fm_raw);

	ai->max_sqnum = fmsb->sqnum;

	fm_pos += sizeof(struct ubi_fm_sb);