lkml.org 
[lkml]   [2012]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/11] ubi: fastmap: Do not free 'ai' in 'scan_all()'
    Date
    From: Shmulik Ladkani <shmulik.ladkani@gmail.com>

    Do not call 'destroy_ai(ai)' at error handling of 'scan_all', since:
    - 'ai' is allocated in 'ubi_attach' (the caller of scan_all) and
    provided as an argument. It's not scan_all's responsibility to free it
    - It is not consistent with scan_all's sister function
    'ubi_attach_fastmap()' which does not free the given 'ai'
    - It will cause a double free as 'ubi_attach' (the caller of scan_all)
    already destroys 'ai' in case of an error

    Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    ---
    drivers/mtd/ubi/attach.c | 4 +---
    1 files changed, 1 insertions(+), 3 deletions(-)

    diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
    index c30a0f6..a343a41 100644
    --- a/drivers/mtd/ubi/attach.c
    +++ b/drivers/mtd/ubi/attach.c
    @@ -1237,7 +1237,7 @@ static int scan_all(struct ubi_device *ubi, struct ubi_attach_info *ai, int star

    ech = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL);
    if (!ech)
    - goto out_ai;
    + return err;

    vidh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL);
    if (!vidh)
    @@ -1298,8 +1298,6 @@ out_vidh:
    ubi_free_vid_hdr(ubi, vidh);
    out_ech:
    kfree(ech);
    -out_ai:
    - destroy_ai(ai);
    return err;
    }

    --
    1.7.6.5


    \
     
     \ /
      Last update: 2012-06-29 19:42    [W:0.027 / U:61.716 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site