iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/ptrace: Use copy_{from, to}_user() rather than open-coding

Browse Source 
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>
This commit is contained in:
Al Viro 2018-05-29 22:57:38 +10:00 committed by Michael Ellerman
parent 20b3449714
commit 6bcdd2972b
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/powerpc/kernel/ptrace.c
View File

@ -3082,27 +3082,19 @@ long arch_ptrace(struct task_struct *child, long request,
#endif /* CONFIG_HAVE_HW_BREAKPOINT */ #endif /* CONFIG_HAVE_HW_BREAKPOINT */
#endif /* CONFIG_PPC_ADV_DEBUG_REGS */ #endif /* CONFIG_PPC_ADV_DEBUG_REGS */
if (!access_ok(VERIFY_WRITE, datavp, if (copy_to_user(datavp, &dbginfo,
sizeof(struct ppc_debug_info))) sizeof(struct ppc_debug_info)))
return -EFAULT; return -EFAULT;
ret = __copy_to_user(datavp, &dbginfo, return 0;
sizeof(struct ppc_debug_info)) ?
-EFAULT : 0;
break;
} }
case PPC_PTRACE_SETHWDEBUG: { case PPC_PTRACE_SETHWDEBUG: {
struct ppc_hw_breakpoint bp_info; struct ppc_hw_breakpoint bp_info;
if (!access_ok(VERIFY_READ, datavp, if (copy_from_user(&bp_info, datavp,
sizeof(struct ppc_hw_breakpoint))) sizeof(struct ppc_hw_breakpoint)))
return -EFAULT; return -EFAULT;
ret = __copy_from_user(&bp_info, datavp, return ppc_set_hwdebug(child, &bp_info);
sizeof(struct ppc_hw_breakpoint)) ?
-EFAULT : 0;
if (!ret)
ret = ppc_set_hwdebug(child, &bp_info);
break;
} }
case PPC_PTRACE_DELHWDEBUG: { case PPC_PTRACE_DELHWDEBUG: {