lkml.org 
[lkml]   [2009]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [v2] sched: Memory leak in two error corner cases
    Date
    If the second in each of these pairs of allocations fails, then
    the first one will not be freed in the error route out.

    Found by a static code analysis tool.

    Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
    ---
    kernel/sched.c | 8 ++++++--
    1 files changed, 6 insertions(+), 2 deletions(-)

    diff --git a/kernel/sched.c b/kernel/sched.c
    index 3c11ae0..ee8046f 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -9765,13 +9765,15 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
    se = kzalloc_node(sizeof(struct sched_entity),
    GFP_KERNEL, cpu_to_node(i));
    if (!se)
    - goto err;
    + goto err_free_rq;

    init_tg_cfs_entry(tg, cfs_rq, se, i, 0, parent->se[i]);
    }

    return 1;

    + err_free_rq:
    + kfree(cfs_rq);
    err:
    return 0;
    }
    @@ -9853,13 +9855,15 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent)
    rt_se = kzalloc_node(sizeof(struct sched_rt_entity),
    GFP_KERNEL, cpu_to_node(i));
    if (!rt_se)
    - goto err;
    + goto err_free_rq;

    init_tg_rt_entry(tg, rt_rq, rt_se, i, 0, parent->rt_se[i]);
    }

    return 1;

    + err_free_rq:
    + kfree(rt_rq);
    err:
    return 0;
    }
    --
    1.6.0.4


    \
     
     \ /
      Last update: 2009-12-10 13:29    [W:4.040 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site