lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 018/176] UBI: Fix double free after do_sync_erase()
    Date
    From: Richard Weinberger <richard@nod.at>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit aa5ad3b6eb8feb2399a5d26c8fb0060561bb9534 upstream.

    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.

    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/mtd/ubi/wl.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
    index c95bfb183c62..49e570abe58b 100644
    --- a/drivers/mtd/ubi/wl.c
    +++ b/drivers/mtd/ubi/wl.c
    @@ -1209,7 +1209,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;
    @@ -1223,10 +1222,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");
    @@ -1262,10 +1259,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;

    --
    2.2.2


    \
     
     \ /
      Last update: 2015-01-29 10:21    [W:4.080 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site