Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9a76cd authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Ralf Baechle
Browse files

MIPS: Use compat_sys_ptrace 



This replaces mips's sys_ptrace32 with a compat_arch_ptrace and
enables the new generic definition of compat_sys_ptrace instead.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b922df73

arch/mips/kernel/ptrace32.c

+8 −35
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * binaries.

 */

#include <linux/compiler.h>

#include <linux/compat.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/mm.h>
@@ -46,37 +47,13 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data); 
 * Tracing a 32-bit process with a 64-bit strace and vice versa will not

 * work.  I don't know how to fix this.

 */

asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)

long compat_arch_ptrace(struct task_struct *child, compat_long_t request,

			compat_ulong_t caddr, compat_ulong_t cdata)

{

	struct task_struct *child;

	int addr = caddr;

	int data = cdata;

	int ret;



#if 0

	printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",

	       (int) request, (int) pid, (unsigned long) addr,

	       (unsigned long) data);

#endif

	lock_kernel();

	if (request == PTRACE_TRACEME) {

		ret = ptrace_traceme();

		goto out;

	}



	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out;

	}



	if (request == PTRACE_ATTACH) {

		ret = ptrace_attach(child);

		goto out_tsk;

	}



	ret = ptrace_check_attach(child, request == PTRACE_KILL);

	if (ret < 0)

		goto out_tsk;



	switch (request) {

	/* when I and D space are separate, these will need to be fixed. */

	case PTRACE_PEEKTEXT: /* read word at location addr. */
@@ -214,7 +191,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
			if (!cpu_has_dsp) {

				tmp = 0;

				ret = -EIO;

				goto out_tsk;

				goto out;

			}

			dregs = __get_dsp_regs(child);

			tmp = (unsigned long) (dregs[addr - DSP_BASE]);
@@ -224,14 +201,14 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
			if (!cpu_has_dsp) {

				tmp = 0;

				ret = -EIO;

				goto out_tsk;

				goto out;

			}

			tmp = child->thread.dsp.dspcontrol;

			break;

		default:

			tmp = 0;

			ret = -EIO;

			goto out_tsk;

			goto out;

		}

		ret = put_user(tmp, (unsigned __user *) (unsigned long) data);

		break;
@@ -414,10 +391,6 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
		ret = ptrace_request(child, request, addr, data);

		break;

	}



out_tsk:

	put_task_struct(child);

out:

	unlock_kernel();

	return ret;

}

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ EXPORT(sysn32_call_table) 
	PTR	compat_sys_getrusage

	PTR	compat_sys_sysinfo

	PTR	compat_sys_times

	PTR	sys32_ptrace

	PTR	compat_sys_ptrace

	PTR	sys_getuid			/* 6100 */

	PTR	sys_syslog

	PTR	sys_getgid

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ sys_call_table: 
	PTR	sys_setuid

	PTR	sys_getuid

	PTR	compat_sys_stime		/* 4025 */

	PTR	sys32_ptrace

	PTR	compat_sys_ptrace

	PTR	sys_alarm

	PTR	sys_ni_syscall			/* was sys_fstat */

	PTR	sys_pause

arch/mips/kernel/signal32.c

+12 −0
Original line number Diff line number Diff line
@@ -482,6 +482,18 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) 
	return err;

}



int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)

{

	memset(to, 0, sizeof *to);



	if (copy_from_user(to, from, 3*sizeof(int)) ||

	    copy_from_user(to->_sifields._pad,

			   from->_sifields._pad, SI_PAD_SIZE32))

		return -EFAULT;



	return 0;

}



asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs)

{

	struct sigframe32 __user *frame;

include/asm-mips/ptrace.h

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
#ifndef _ASM_PTRACE_H

#define _ASM_PTRACE_H



#ifdef CONFIG_64BIT

#define __ARCH_WANT_COMPAT_SYS_PTRACE

#endif



/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */

#define FPR_BASE	32