mtd: ubi: don't leak e if schedule_erase() fails

Sebastian Siewior · richardweinberger · commit 6b238de189f6 · 2015-12-16T22:59:03.000+01:00
If __erase_worker() fails to erase the EB and schedule_erase() fails as
well to do anything about it then we go RO. But that is not a reason to
leak the e argument here. Therefore clean up e.

Cc: &lt;stable@vger.kernel.org&gt;
Signed-off-by: Sebastian Andrzej Siewior &lt;bigeasy@linutronix.de&gt;
Signed-off-by: Richard Weinberger &lt;richard@nod.at&gt;
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
@@ -1060,6 +1060,7 @@ static int __erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk)
 		/* Re-schedule the LEB for erasure */
 		err1 = schedule_erase(ubi, e, vol_id, lnum, 0);
 		if (err1) {
+			wl_entry_destroy(ubi, e);
 			err = err1;
 			goto out_ro;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1060,6 +1060,7 @@ static int __erase_worker(struct ubi_device ubi, struct ubi_work wl_wrk)`
`1060`	`1060`	`/* Re-schedule the LEB for erasure */`
`1061`	`1061`	`err1 = schedule_erase(ubi, e, vol_id, lnum, 0);`
`1062`	`1062`	`if (err1) {`
	`1063`	`+ wl_entry_destroy(ubi, e);`
`1063`	`1064`	`err = err1;`
`1064`	`1065`	`goto out_ro;`
`1065`	`1066`	`}`