Skip to content

Commit

Permalink
powerpc/ptrace: Use copy_{from, to}_user() rather than open-coding
Browse files Browse the repository at this point in the history
In PPC_PTRACE_GETHWDBGINFO and PPC_PTRACE_SETHWDEBUG we do an
access_ok() check and then __copy_{from,to}_user().

Instead we should just use copy_{from,to}_user() which does all that
for us and is less error prone.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Al Viro authored and Michael Ellerman committed Jun 3, 2018
1 parent 20b3449 commit 6bcdd29
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions arch/powerpc/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3082,27 +3082,19 @@ long arch_ptrace(struct task_struct *child, long request,
#endif /* CONFIG_HAVE_HW_BREAKPOINT */
#endif /* CONFIG_PPC_ADV_DEBUG_REGS */

if (!access_ok(VERIFY_WRITE, datavp,
sizeof(struct ppc_debug_info)))
if (copy_to_user(datavp, &dbginfo,
sizeof(struct ppc_debug_info)))
return -EFAULT;
ret = __copy_to_user(datavp, &dbginfo,
sizeof(struct ppc_debug_info)) ?
-EFAULT : 0;
break;
return 0;
}

case PPC_PTRACE_SETHWDEBUG: {
struct ppc_hw_breakpoint bp_info;

if (!access_ok(VERIFY_READ, datavp,
sizeof(struct ppc_hw_breakpoint)))
if (copy_from_user(&bp_info, datavp,
sizeof(struct ppc_hw_breakpoint)))
return -EFAULT;
ret = __copy_from_user(&bp_info, datavp,
sizeof(struct ppc_hw_breakpoint)) ?
-EFAULT : 0;
if (!ret)
ret = ppc_set_hwdebug(child, &bp_info);
break;
return ppc_set_hwdebug(child, &bp_info);
}

case PPC_PTRACE_DELHWDEBUG: {
Expand Down

0 comments on commit 6bcdd29

Please sign in to comment.