| Message ID | 1415288869-14915-1-git-send-email-richard@nod.at |
|---|---|
| State | Accepted |
| Commit | aa5ad3b6eb8feb2399a5d26c8fb0060561bb9534 |
| Headers | show |
On Thu, 2014-11-06 at 16:47 +0100, Richard Weinberger wrote: > 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: Richard Weinberger <richard@nod.at> Pushed, thanks!
Am 07.11.2014 um 12:50 schrieb Artem Bityutskiy: > On Thu, 2014-11-06 at 16:47 +0100, Richard Weinberger wrote: >> 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: Richard Weinberger <richard@nod.at> > > Pushed, thanks! BTW: Please don't forget "[PATCH] UBI: Fix invalid vfree()". Thanks, //richard
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 6654f191..b9686c1 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1212,7 +1212,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; @@ -1226,10 +1225,8 @@ 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"); @@ -1265,10 +1262,9 @@ out_not_moved: 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;
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: Richard Weinberger <richard@nod.at> --- drivers/mtd/ubi/wl.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)