lkml.org 
[lkml]   [2010]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 7/14] m68knommu: use generic ptrace_resume code
    Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT,
    PTRACE_KILL and PTRACE_SINGLESTEP. m68knommu already defines the
    nessecary user_enable_single_step and user_disable_single_step functions
    for this.

    Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL
    which it previously wasn't which is consistent with all architectures
    using the modern ptrace code.

    Signed-off-by: Christoph Hellwig <hch@lst.de>

    Index: linux-2.6/arch/m68knommu/kernel/ptrace.c
    ===================================================================
    --- linux-2.6.orig/arch/m68knommu/kernel/ptrace.c 2010-02-02 11:00:49.987254269 +0100
    +++ linux-2.6/arch/m68knommu/kernel/ptrace.c 2010-02-02 11:22:17.003259609 +0100
    @@ -190,62 +190,6 @@ long arch_ptrace(struct task_struct *chi
    }
    break;

    - case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
    - case PTRACE_CONT: { /* restart after signal. */
    - long tmp;
    -
    - ret = -EIO;
    - if (!valid_signal(data))
    - break;
    - if (request == PTRACE_SYSCALL)
    - set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
    - else
    - clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
    - child->exit_code = data;
    - /* make sure the single step bit is not set. */
    - tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
    - put_reg(child, PT_SR, tmp);
    - wake_up_process(child);
    - ret = 0;
    - break;
    - }
    -
    - /*
    - * make the child exit. Best I can do is send it a sigkill.
    - * perhaps it should be put in the status that it wants to
    - * exit.
    - */
    - case PTRACE_KILL: {
    - long tmp;
    -
    - ret = 0;
    - if (child->exit_state == EXIT_ZOMBIE) /* already dead */
    - break;
    - child->exit_code = SIGKILL;
    - /* make sure the single step bit is not set. */
    - tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
    - put_reg(child, PT_SR, tmp);
    - wake_up_process(child);
    - break;
    - }
    -
    - case PTRACE_SINGLESTEP: { /* set the trap flag. */
    - long tmp;
    -
    - ret = -EIO;
    - if (!valid_signal(data))
    - break;
    - clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
    - tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
    - put_reg(child, PT_SR, tmp);
    -
    - child->exit_code = data;
    - /* give it a chance to run. */
    - wake_up_process(child);
    - ret = 0;
    - break;
    - }
    -
    case PTRACE_GETREGS: { /* Get all gp regs from the child. */
    int i;
    unsigned long tmp;

    \
     
     \ /
      Last update: 2010-02-02 20:03    [W:0.058 / U:1.476 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site