lkml.org 
[lkml]   [2010]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 110/164] perf_events: Fix resource leak in x86 __hw_perf_event_init()
    2.6.33-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stephane Eranian <eranian@google.com>

    commit 4b24a88b35e15e04bd8f2c5dda65b5dc8ebca05f upstream.

    If reserve_pmc_hardware() succeeds but reserve_ds_buffers()
    fails, then we need to release_pmc_hardware. It won't be done
    by the destroy() callback because we return before setting it
    in case of error.

    Signed-off-by: Stephane Eranian <eranian@google.com>
    Cc: peterz@infradead.org
    Cc: paulus@samba.org
    Cc: davem@davemloft.net
    Cc: fweisbec@gmail.com
    Cc: robert.richter@amd.com
    Cc: perfmon2-devel@lists.sf.net
    LKML-Reference: <4ba1568b.15185e0a.182a.7802@mx.google.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/cpu/perf_event.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -1060,8 +1060,11 @@ static int __hw_perf_event_init(struct p
    if (atomic_read(&active_events) == 0) {
    if (!reserve_pmc_hardware())
    err = -EBUSY;
    - else
    + else {
    err = reserve_bts_hardware();
    + if (err)
    + release_pmc_hardware();
    + }
    }
    if (!err)
    atomic_inc(&active_events);



    \
     
     \ /
      Last update: 2010-07-01 22:59    [from the cache]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site