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

Commit aa5ad3b6 authored by Richard Weinberger's avatar Richard Weinberger Committed by Artem Bityutskiy
Browse files

UBI: Fix double free after do_sync_erase() 



If the erase worker is unable to erase a PEB it will
free the ubi_wl_entry itself.
The failing ubi_wl_entry must not free()'d again after
do_sync_erase() returns.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent a76284e6

drivers/mtd/ubi/wl.c

+3 −7
Original line number Diff line number Diff line
@@ -1216,7 +1216,6 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 


	err = do_sync_erase(ubi, e1, vol_id, lnum, 0);

	if (err) {

		kmem_cache_free(ubi_wl_entry_slab, e1);

		if (e2)

			kmem_cache_free(ubi_wl_entry_slab, e2);

		goto out_ro;
@@ -1230,11 +1229,9 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
		dbg_wl("PEB %d (LEB %d:%d) was put meanwhile, erase",

		       e2->pnum, vol_id, lnum);

		err = do_sync_erase(ubi, e2, vol_id, lnum, 0);

		if (err) {

			kmem_cache_free(ubi_wl_entry_slab, e2);

		if (err)

			goto out_ro;

	}

	}



	dbg_wl("done");

	mutex_unlock(&ubi->move_mutex);
@@ -1269,10 +1266,9 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 


	ubi_free_vid_hdr(ubi, vid_hdr);

	err = do_sync_erase(ubi, e2, vol_id, lnum, torture);

	if (err) {

		kmem_cache_free(ubi_wl_entry_slab, e2);

	if (err)

		goto out_ro;

	}



	mutex_unlock(&ubi->move_mutex);

	return 0;