lkml.org 
[lkml]   [2008]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 06/21] fat: cleanup fat_parse_long() error handling
    From
    Date

    From: "Darren Jenkins" <darrenrjenkins@gmail.com>

    Coverity CID 2332 & 2333 RESOURCE_LEAK

    In fat_search_long() if fat_parse_long() returns a -ve value we return
    without first freeing unicode. This patch free's them on this error path.

    The above was false positive on current tree, but this change is more
    clean, so apply as cleanup.

    [hirofumi@mail.parknet.co.jp: fix coding style]
    Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    ---

    fs/fat/dir.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff -puN fs/fat/dir.c~fat_fat_parse_long-cleanup fs/fat/dir.c
    --- linux-2.6/fs/fat/dir.c~fat_fat_parse_long-cleanup 2008-08-24 23:14:01.000000000 +0900
    +++ linux-2.6-hirofumi/fs/fat/dir.c 2008-08-24 23:14:01.000000000 +0900
    @@ -373,9 +373,10 @@ parse_record:
    if (de->attr == ATTR_EXT) {
    int status = fat_parse_long(inode, &cpos, &bh, &de,
    &unicode, &nr_slots);
    - if (status < 0)
    - return status;
    - else if (status == PARSE_INVALID)
    + if (status < 0) {
    + err = status;
    + goto end_of_dir;
    + } else if (status == PARSE_INVALID)
    continue;
    else if (status == PARSE_NOT_LONGNAME)
    goto parse_record;
    _

    \
     
     \ /
      Last update: 2008-10-15 16:21    [W:0.020 / U:0.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site