lkml.org 
[lkml]   [2008]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 5/9] x86_64 ptrace: fix sys32_ptrace task_struct leak
    2.6.25-stable review patch.  If anyone has any objections, please let us
    know.

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

    From: Roland McGrath <roland@redhat.com>

    Commit 5a4646a4efed8c835f76c3b88f3155f6ab5b8d9b introduced a leak of
    task_struct refs into sys32_ptrace. This bug has already gone away in
    for 2.6.26 in commit 562b80bafffaf42a6d916b0a2ee3d684220a1c10.

    Signed-off-by: Roland McGrath <roland@redhat.com>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/ptrace.c | 45 ++++++++++++++++++++++++++-------------------
    1 file changed, 26 insertions(+), 19 deletions(-)

    --- a/arch/x86/kernel/ptrace.c
    +++ b/arch/x86/kernel/ptrace.c
    @@ -1309,42 +1309,49 @@ asmlinkage long sys32_ptrace(long reques
    break;

    case PTRACE_GETREGS: /* Get all gp regs from the child. */
    - return copy_regset_to_user(child, &user_x86_32_view,
    - REGSET_GENERAL,
    - 0, sizeof(struct user_regs_struct32),
    - datap);
    + ret = copy_regset_to_user(child, &user_x86_32_view,
    + REGSET_GENERAL,
    + 0, sizeof(struct user_regs_struct32),
    + datap);
    + break;

    case PTRACE_SETREGS: /* Set all gp regs in the child. */
    - return copy_regset_from_user(child, &user_x86_32_view,
    - REGSET_GENERAL, 0,
    - sizeof(struct user_regs_struct32),
    - datap);
    + ret = copy_regset_from_user(child, &user_x86_32_view,
    + REGSET_GENERAL, 0,
    + sizeof(struct user_regs_struct32),
    + datap);
    + break;

    case PTRACE_GETFPREGS: /* Get the child FPU state. */
    - return copy_regset_to_user(child, &user_x86_32_view,
    - REGSET_FP, 0,
    - sizeof(struct user_i387_ia32_struct),
    - datap);
    + ret = copy_regset_to_user(child, &user_x86_32_view,
    + REGSET_FP, 0,
    + sizeof(struct user_i387_ia32_struct),
    + datap);
    + break;

    case PTRACE_SETFPREGS: /* Set the child FPU state. */
    - return copy_regset_from_user(
    + ret = copy_regset_from_user(
    child, &user_x86_32_view, REGSET_FP,
    0, sizeof(struct user_i387_ia32_struct), datap);
    + break;

    case PTRACE_GETFPXREGS: /* Get the child extended FPU state. */
    - return copy_regset_to_user(child, &user_x86_32_view,
    - REGSET_XFP, 0,
    - sizeof(struct user32_fxsr_struct),
    - datap);
    + ret = copy_regset_to_user(child, &user_x86_32_view,
    + REGSET_XFP, 0,
    + sizeof(struct user32_fxsr_struct),
    + datap);
    + break;

    case PTRACE_SETFPXREGS: /* Set the child extended FPU state. */
    - return copy_regset_from_user(child, &user_x86_32_view,
    + ret = copy_regset_from_user(child, &user_x86_32_view,
    REGSET_XFP, 0,
    sizeof(struct user32_fxsr_struct),
    datap);
    + break;

    default:
    - return compat_ptrace_request(child, request, addr, data);
    + ret = compat_ptrace_request(child, request, addr, data);
    + break;
    }

    out:
    --


    \
     
     \ /
      Last update: 2008-07-01 17:27    [W:4.207 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site