lkml.org 
[lkml]   [2010]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 16/24] ptrace: cleanup arch_ptrace() on mn10300
    Date
    Use new 'datap' variable in order to remove unnecessary castings.
    Also remove checking @addr less than 0 because @addr is now unsigned.

    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
    ---
    arch/mn10300/kernel/ptrace.c | 17 ++++++++---------
    1 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/arch/mn10300/kernel/ptrace.c b/arch/mn10300/kernel/ptrace.c
    index ec4b414..5c0b07e 100644
    --- a/arch/mn10300/kernel/ptrace.c
    +++ b/arch/mn10300/kernel/ptrace.c
    @@ -300,27 +300,26 @@ long arch_ptrace(struct task_struct *child, long request,
    {
    unsigned long tmp;
    int ret;
    + unsigned long __user *datap = (unsigned long __user *) data;

    switch (request) {
    /* read the word at location addr in the USER area. */
    case PTRACE_PEEKUSR:
    ret = -EIO;
    - if ((addr & 3) || addr < 0 ||
    - addr > sizeof(struct user) - 3)
    + if ((addr & 3) || addr > sizeof(struct user) - 3)
    break;

    tmp = 0; /* Default return condition */
    if (addr < NR_PTREGS << 2)
    tmp = get_stack_long(child,
    ptrace_regid_to_frame[addr]);
    - ret = put_user(tmp, (unsigned long *) data);
    + ret = put_user(tmp, datap);
    break;

    /* write the word at location addr in the USER area */
    case PTRACE_POKEUSR:
    ret = -EIO;
    - if ((addr & 3) || addr < 0 ||
    - addr > sizeof(struct user) - 3)
    + if ((addr & 3) || addr > sizeof(struct user) - 3)
    break;

    ret = 0;
    @@ -333,25 +332,25 @@ long arch_ptrace(struct task_struct *child, long request,
    return copy_regset_to_user(child, &user_mn10300_native_view,
    REGSET_GENERAL,
    0, NR_PTREGS * sizeof(long),
    - (void __user *)data);
    + datap);

    case PTRACE_SETREGS: /* Set all integer regs in the child. */
    return copy_regset_from_user(child, &user_mn10300_native_view,
    REGSET_GENERAL,
    0, NR_PTREGS * sizeof(long),
    - (const void __user *)data);
    + datap);

    case PTRACE_GETFPREGS: /* Get the child FPU state. */
    return copy_regset_to_user(child, &user_mn10300_native_view,
    REGSET_FPU,
    0, sizeof(struct fpu_state_struct),
    - (void __user *)data);
    + datap);

    case PTRACE_SETFPREGS: /* Set the child FPU state. */
    return copy_regset_from_user(child, &user_mn10300_native_view,
    REGSET_FPU,
    0, sizeof(struct fpu_state_struct),
    - (const void __user *)data);
    + datap);

    default:
    ret = ptrace_request(child, request, addr, data);
    --
    1.7.2.2


    \
     
     \ /
      Last update: 2010-09-02 18:21    [W:4.087 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site