lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[014/205] fix mis-applied upstream commit ac9721f3f54b27a16c7e1afb2481e7ee95a70318
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

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

    From: Jan Beulich <JBeulich@novell.com>

    For some reason one of the changes to sys_perf_event_open() got
    mis-applied, thus breaking (at least) error handling paths (pointed
    out by means of a compiler warning).

    Signed-off-by: Jan Beulich <jbeulich@novell.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    kernel/perf_event.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/kernel/perf_event.c
    +++ b/kernel/perf_event.c
    @@ -4870,6 +4870,15 @@ SYSCALL_DEFINE5(perf_event_open,
    if (event_fd < 0)
    return event_fd;

    + /*
    + * Get the target context (task or percpu):
    + */
    + ctx = find_get_context(pid, cpu);
    + if (IS_ERR(ctx)) {
    + err = PTR_ERR(ctx);
    + goto err_fd;
    + }
    +
    if (group_fd != -1) {
    group_leader = perf_fget_light(group_fd, &fput_needed);
    if (IS_ERR(group_leader)) {
    @@ -4884,15 +4893,6 @@ SYSCALL_DEFINE5(perf_event_open,
    }

    /*
    - * Get the target context (task or percpu):
    - */
    - ctx = find_get_context(pid, cpu);
    - if (IS_ERR(ctx)) {
    - err = PTR_ERR(ctx);
    - goto err_fd;
    - }
    -
    - /*
    * Look up the group leader (we will attach this event to it):
    */
    if (group_leader) {



    \
     
     \ /
      Last update: 2010-07-30 20:43    [W:0.035 / U:89.428 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site