ubi: fastmap: Don't produce the initial next anchor PEB when fastmap …

…is disabled Following process triggers a memleak caused by forgetting to release the initial next anchor PEB (CONFIG_MTD_UBI_FASTMAP is disabled): 1. attach -> __erase_worker -> produce the initial next anchor PEB 2. detach -> ubi_fastmap_close (Do nothing, it should have released the initial next anchor PEB) Don't produce the initial next anchor PEB in __erase_worker() when fastmap is disabled. Signed-off-by: Zhihao Cheng <[email protected]> Suggested-by: Sascha Hauer <[email protected]> Fixes: f9c34bb ("ubi: Fix producing anchor PEBs") Reported-by: [email protected] Signed-off-by: Richard Weinberger <[email protected]>
kawasaki · Aug 2, 2020 · 3b18525 · 3b18525
1 parent fcf4419
commit 3b18525
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
@@ -1086,7 +1086,8 @@ static int __erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk)
 	if (!err) {
 		spin_lock(&ubi->wl_lock);
 
-		if (!ubi->fm_next_anchor && e->pnum < UBI_FM_MAX_START) {
+		if (!ubi->fm_disabled && !ubi->fm_next_anchor &&
+		    e->pnum < UBI_FM_MAX_START) {
 			/* Abort anchor production, if needed it will be
 			 * enabled again in the wear leveling started below.
 			 */