Merge with Linux 2.4.2.

1 files changed, 613 insertions, 0 deletions

diff --git a/arch/s390x/kernel/ptrace.c b/arch/s390x/kernel/ptrace.c
new file mode 100644
index 000000000..d70b76d2b
--- /dev/null
+++ b/arch/s390x/kernel/ptrace.c
@@ -0,0 +1,613 @@
+/*
+ *  arch/s390/kernel/ptrace.c
+ *
+ *  S390 version
+ *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
+ *
+ *  Based on PowerPC version 
+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
+ *
+ *  Derived from "arch/m68k/kernel/ptrace.c"
+ *  Copyright (C) 1994 by Hamish Macdonald
+ *  Taken from linux/kernel/ptrace.c and modified for M680x0.
+ *  linux/kernel/ptrace.c is by Ross Biro 1/23/92, edited by Linus Torvalds
+ *
+ * Modified by Cort Dougan (cort@cs.nmt.edu) 
+ *
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file README.legal in the main directory of
+ * this archive for more details.
+ */
+
+#include <stddef.h>
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/smp.h>
+#include <linux/smp_lock.h>
+#include <linux/errno.h>
+#include <linux/ptrace.h>
+#include <linux/user.h>
+
+#include <asm/segment.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
+
+void FixPerRegisters(struct task_struct *task)
+{
+	struct pt_regs *regs = task->thread.regs;
+	per_struct *per_info=
+			(per_struct *)&task->thread.per_info;
+
+	per_info->control_regs.bits.em_instruction_fetch =
+	        per_info->single_step | per_info->instruction_fetch;
+	
+	if (per_info->single_step) {
+		per_info->control_regs.bits.starting_addr=0;
+#ifdef CONFIG_S390_SUPPORT
+		if (current->thread.flags & S390_FLAG_31BIT) {
+			per_info->control_regs.bits.ending_addr=0x7fffffffUL;
+	        }
+		else 
+#endif      
+		{
+		per_info->control_regs.bits.ending_addr=-1L;
+		}
+	} else {
+		per_info->control_regs.bits.starting_addr=
+		        per_info->starting_addr;
+		per_info->control_regs.bits.ending_addr=
+		        per_info->ending_addr;
+	}
+	/* if any of the control reg tracing bits are on 
+	   we switch on per in the psw */
+	if (per_info->control_regs.words.cr[0] & PER_EM_MASK)
+		regs->psw.mask |= PSW_PER_MASK;
+	else
+		regs->psw.mask &= ~PSW_PER_MASK;
+	if (per_info->control_regs.bits.storage_alt_space_ctl)
+		task->thread.user_seg |= USER_STD_MASK;
+	else
+		task->thread.user_seg &= ~USER_STD_MASK;
+}
+
+void set_single_step(struct task_struct *task)
+{
+	per_struct *per_info= (per_struct *) &task->thread.per_info;	
+	
+	per_info->single_step = 1;  /* Single step */
+	FixPerRegisters (task);
+}
+
+void clear_single_step(struct task_struct *task)
+{
+	per_struct *per_info= (per_struct *) &task->thread.per_info;
+
+	per_info->single_step = 0;
+	FixPerRegisters (task);
+}
+
+int ptrace_usercopy(addr_t realuseraddr, addr_t copyaddr, int len,
+                    int tofromuser, int writeuser, unsigned long mask)
+{
+        unsigned long *realuserptr, *copyptr;
+	unsigned long tempuser;
+	int retval;
+
+        retval = 0;
+        realuserptr = (unsigned long *) realuseraddr;
+        copyptr = (unsigned long *) copyaddr;
+
+	if (writeuser && realuserptr == NULL)
+		return 0;
+
+	if (mask != -1L) {
+		tempuser = *realuserptr;
+		if (!writeuser) {
+			tempuser &= mask;
+			realuserptr = &tempuser;
+		}
+	}
+	if (tofromuser) {
+		if (writeuser) {
+			retval = copy_from_user(realuserptr, copyptr, len);
+		} else {
+			if (realuserptr == NULL)
+				retval = clear_user(copyptr, len);
+			else
+				retval = copy_to_user(copyptr,realuserptr,len);
+                        retval = (retval == -EFAULT) ? -EIO : 0;
+		}      
+	} else {
+		if (writeuser)
+			memcpy(realuserptr, copyptr, len);
+		else
+			memcpy(copyptr, realuserptr, len);
+	}
+	if (mask != -1L && writeuser)
+                *realuserptr = (*realuserptr & mask) | (tempuser & ~mask);
+	return retval;
+}
+
+int copy_user(struct task_struct *task,saddr_t useraddr, addr_t copyaddr,
+              int len, int tofromuser, int writingtouser)
+{
+	int copylen=0,copymax;
+	addr_t  realuseraddr;
+	saddr_t enduseraddr;
+	
+	unsigned long mask;
+
+#ifdef CONFIG_S390_SUPPORT
+	if (current->thread.flags & S390_FLAG_31BIT) {
+	/* adjust user offsets to 64 bit structure */
+		if (useraddr < PT_PSWADDR / 2)
+			useraddr = 2 * useraddr;
+		else if(useraddr < PT_ACR0 / 2)
+			useraddr = 2 * useraddr + sizeof(addr_t) / 2;
+		else if(useraddr < PT_ACR0 / 2 + (PT_ORIGGPR2 - PT_ACR0))
+			useraddr = useraddr + PT_ACR0 / 2;
+		else if(useraddr < PT_ACR0 / 2 + (sizeof(user_regs_struct) - sizeof(addr_t) / 2 - PT_ACR0))
+			useraddr = useraddr + PT_ACR0 / 2 + sizeof(addr_t) / 2; 
+        }
+#endif  
+    
+	enduseraddr=useraddr+len;
+
+	if (useraddr < 0 || enduseraddr > sizeof(struct user)||
+	   (useraddr < PT_ENDREGS && (useraddr&3))||
+	   (enduseraddr < PT_ENDREGS && (enduseraddr&3)))
+		return (-EIO);
+	while(len>0)
+	{
+		mask=PSW_ADDR_MASK;
+		if(useraddr<PT_FPC)
+		{
+			realuseraddr=(addr_t)&(((u8 *)task->thread.regs)[useraddr]);
+			if(useraddr<PT_PSWMASK)
+			{
+				copymax=PT_PSWMASK;
+			}
+			else if(useraddr<(PT_PSWMASK+PSW_MASK_SIZE))
+			{
+				copymax=(PT_PSWMASK+PSW_MASK_SIZE);
+				if(writingtouser)
+					mask=PSW_MASK_DEBUGCHANGE;
+			}
+			else if(useraddr<(PT_PSWADDR+PSW_ADDR_SIZE))
+			{
+				copymax=PT_PSWADDR+PSW_ADDR_SIZE;
+				mask=PSW_ADDR_DEBUGCHANGE;
+			}
+			else
+				copymax=PT_FPC;
+			
+		}
+		else if(useraddr<(PT_FPR15+sizeof(freg_t)))
+		{
+			copymax=(PT_FPR15+sizeof(freg_t));
+			realuseraddr=(addr_t)&(((u8 *)&task->thread.fp_regs)[useraddr-PT_FPC]);
+		}
+		else if(useraddr<sizeof(user_regs_struct))
+		{
+			copymax=sizeof(user_regs_struct);
+			realuseraddr=(addr_t)&(((u8 *)&task->thread.per_info)[useraddr-PT_CR_9]);
+		}
+		else 
+		{
+			copymax=sizeof(struct user);
+			realuseraddr=(addr_t)NULL;
+		}
+		copylen=copymax-useraddr;
+		copylen=(copylen>len ? len:copylen);
+		if(ptrace_usercopy(realuseraddr,copyaddr,copylen,tofromuser,writingtouser,mask))
+			return (-EIO);
+		copyaddr+=copylen;
+		len-=copylen;
+		useraddr+=copylen;
+	}
+	FixPerRegisters(task);
+	return(0);
+}
+
+asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
+{
+	struct task_struct *child;
+	int ret = -EPERM;
+	unsigned long flags;
+	unsigned long tmp;
+	int copied;
+	ptrace_area   parea; 
+
+	lock_kernel();
+	if (request == PTRACE_TRACEME) 
+	{
+		/* are we already being traced? */
+		if (current->ptrace & PT_PTRACED)
+			goto out;
+		/* set the ptrace bit in the process flags. */
+		current->ptrace |= PT_PTRACED;
+		ret = 0;
+		goto out;
+	}
+	ret = -ESRCH;
+	read_lock(&tasklist_lock);
+	child = find_task_by_pid(pid);
+	read_unlock(&tasklist_lock);
+	if (!child)
+		goto out;
+	ret = -EPERM;
+	if (pid == 1)		/* you may not mess with init */
+		goto out;
+	if (request == PTRACE_ATTACH) 
+	{
+		if (child == current)
+			goto out;
+		if ((!child->dumpable ||
+		     (current->uid != child->euid) ||
+		     (current->uid != child->suid) ||
+		     (current->uid != child->uid) ||
+		     (current->gid != child->egid) ||
+		     (current->gid != child->sgid)) && !capable(CAP_SYS_PTRACE))
+			goto out;
+		/* the same process cannot be attached many times */
+		if (child->ptrace & PT_PTRACED)
+			goto out;
+		child->ptrace |= PT_PTRACED;
+
+		write_lock_irqsave(&tasklist_lock, flags);
+		if (child->p_pptr != current) 
+		{
+			REMOVE_LINKS(child);
+			child->p_pptr = current;
+			SET_LINKS(child);
+		}
+		write_unlock_irqrestore(&tasklist_lock, flags);
+
+		send_sig(SIGSTOP, child, 1);
+		ret = 0;
+		goto out;
+	}
+	ret = -ESRCH;
+	// printk("child=%lX child->flags=%lX",child,child->flags);
+	/* I added child!=current line so we can get the */
+	/* ieee_instruction_pointer from the user structure DJB */
+	if(child!=current)
+	{
+		if (!(child->ptrace & PT_PTRACED))
+			goto out;
+		if (child->state != TASK_STOPPED) 
+		{
+			if (request != PTRACE_KILL)
+				goto out;
+		}
+		if (child->p_pptr != current)
+			goto out;
+	}
+	switch (request) 
+	{
+		/* If I and D space are separate, these will need to be fixed. */
+	case PTRACE_PEEKTEXT: /* read word at location addr. */ 
+	case PTRACE_PEEKDATA: 
+		copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+		ret = -EIO;
+		if (copied != sizeof(tmp))
+			goto out;
+		ret = put_user(tmp,(unsigned long *) data);
+		goto out;
+
+		/* read the word at location addr in the USER area. */
+	case PTRACE_PEEKUSR:
+		ret=copy_user(child,addr,data,sizeof(unsigned long),1,0);
+		break;
+
+		/* If I and D space are separate, this will have to be fixed. */
+	case PTRACE_POKETEXT: /* write the word at location addr. */
+	case PTRACE_POKEDATA:
+		ret = 0;
+		if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
+			goto out;
+		ret = -EIO;
+		goto out;
+		break;
+
+	case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
+		ret=copy_user(child,addr,(addr_t)&data,sizeof(unsigned long),0,1);
+		break;
+
+	case PTRACE_SYSCALL: 	/* continue and stop at next (return from) syscall */
+	case PTRACE_CONT: 	 /* restart after signal. */
+		ret = -EIO;
+		if ((unsigned long) data >= _NSIG)
+			break;
+		if (request == PTRACE_SYSCALL)
+			child->ptrace |= PT_TRACESYS;
+		else
+			child->ptrace &= ~PT_TRACESYS;
+		child->exit_code = data;
+		/* make sure the single step bit is not set. */
+		clear_single_step(child);
+		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:
+		ret = 0;
+		if (child->state == TASK_ZOMBIE) /* already dead */
+			break;
+		child->exit_code = SIGKILL;
+		clear_single_step(child);
+		wake_up_process(child);
+		/* make sure the single step bit is not set. */
+		break;
+
+	case PTRACE_SINGLESTEP:  /* set the trap flag. */
+		ret = -EIO;
+		if ((unsigned long) data >= _NSIG)
+			break;
+		child->ptrace &= ~PT_TRACESYS;
+		child->exit_code = data;
+		set_single_step(child);
+		/* give it a chance to run. */
+		wake_up_process(child);
+		ret = 0;
+		break;
+
+	case PTRACE_DETACH:  /* detach a process that was attached. */
+		ret = -EIO;
+		if ((unsigned long) data >= _NSIG)
+			break;
+		child->ptrace &= ~(PT_PTRACED|PT_TRACESYS);
+		child->exit_code = data;
+		write_lock_irqsave(&tasklist_lock, flags);
+		REMOVE_LINKS(child);
+		child->p_pptr = child->p_opptr;
+		SET_LINKS(child);
+		write_unlock_irqrestore(&tasklist_lock, flags);
+		/* make sure the single step bit is not set. */
+		clear_single_step(child);
+		wake_up_process(child);
+		ret = 0;
+		break;
+	case PTRACE_PEEKUSR_AREA:
+	case PTRACE_POKEUSR_AREA:
+		if((ret=copy_from_user(&parea,(void *)addr,sizeof(parea)))==0)  
+		   ret=copy_user(child,parea.kernel_addr,parea.process_addr,
+				 parea.len,1,(request==PTRACE_POKEUSR_AREA));
+		break;
+	default:
+		ret = -EIO;
+		break;
+	}
+ out:
+	unlock_kernel();
+	return ret;
+}
+
+typedef struct
+{
+__u32	len;
+__u32	kernel_addr;
+__u32	process_addr;
+} ptrace_area_emu31;
+
+asmlinkage int sys32_ptrace(long request, long pid, long addr, s32 data)
+{
+	struct task_struct *child;
+	int ret = -EPERM;
+	unsigned long flags;
+	u32 tmp;
+	int copied;
+	ptrace_area   parea; 
+
+	lock_kernel();
+	if (request == PTRACE_TRACEME) 
+	{
+		/* are we already being traced? */
+		if (current->ptrace & PT_PTRACED)
+			goto out;
+		/* set the ptrace bit in the process flags. */
+		current->ptrace |= PT_PTRACED;
+		ret = 0;
+		goto out;
+	}
+	ret = -ESRCH;
+	read_lock(&tasklist_lock);
+	child = find_task_by_pid(pid);
+	read_unlock(&tasklist_lock);
+	if (!child)
+		goto out;
+	ret = -EPERM;
+	if (pid == 1)		/* you may not mess with init */
+		goto out;
+	if (request == PTRACE_ATTACH) 
+	{
+		if (child == current)
+			goto out;
+		if ((!child->dumpable ||
+		     (current->uid != child->euid) ||
+		     (current->uid != child->suid) ||
+		     (current->uid != child->uid) ||
+		     (current->gid != child->egid) ||
+		     (current->gid != child->sgid)) && !capable(CAP_SYS_PTRACE))
+			goto out;
+		/* the same process cannot be attached many times */
+		if (child->ptrace & PT_PTRACED)
+			goto out;
+		child->ptrace |= PT_PTRACED;
+
+		write_lock_irqsave(&tasklist_lock, flags);
+		if (child->p_pptr != current) 
+		{
+			REMOVE_LINKS(child);
+			child->p_pptr = current;
+			SET_LINKS(child);
+		}
+		write_unlock_irqrestore(&tasklist_lock, flags);
+
+		send_sig(SIGSTOP, child, 1);
+		ret = 0;
+		goto out;
+	}
+	ret = -ESRCH;
+	// printk("child=%lX child->flags=%lX",child,child->flags);
+	/* I added child!=current line so we can get the */
+	/* ieee_instruction_pointer from the user structure DJB */
+	if(child!=current)
+	{
+		if (!(child->ptrace & PT_PTRACED))
+			goto out;
+		if (child->state != TASK_STOPPED) 
+		{
+			if (request != PTRACE_KILL)
+				goto out;
+		}
+		if (child->p_pptr != current)
+			goto out;
+	}
+	switch (request) 
+	{
+		/* If I and D space are separate, these will need to be fixed. */
+	case PTRACE_PEEKTEXT: /* read word at location addr. */ 
+	case PTRACE_PEEKDATA: 
+		copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+		ret = -EIO;
+		if (copied != sizeof(tmp))
+			goto out;
+		ret = put_user(tmp,(u32 *)(unsigned long)data);
+		goto out;
+
+		/* read the word at location addr in the USER area. */
+	case PTRACE_PEEKUSR:
+		ret=copy_user(child,addr,data,sizeof(u32),1,0);
+		break;
+
+		/* If I and D space are separate, this will have to be fixed. */
+	case PTRACE_POKETEXT: /* write the word at location addr. */
+	case PTRACE_POKEDATA:
+		ret = 0;
+		if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
+			goto out;
+		ret = -EIO;
+		goto out;
+		break;
+
+	case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
+		ret=copy_user(child,addr,(addr_t)&data,sizeof(u32),0,1);
+		break;
+
+	case PTRACE_SYSCALL: 	/* continue and stop at next (return from) syscall */
+	case PTRACE_CONT: 	 /* restart after signal. */
+		ret = -EIO;
+		if ((unsigned long) data >= _NSIG)
+			break;
+		if (request == PTRACE_SYSCALL)
+			child->ptrace |= PT_TRACESYS;
+		else
+			child->ptrace &= ~PT_TRACESYS;
+		child->exit_code = data;
+		/* make sure the single step bit is not set. */
+		clear_single_step(child);
+		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:
+		ret = 0;
+		if (child->state == TASK_ZOMBIE) /* already dead */
+			break;
+		child->exit_code = SIGKILL;
+		clear_single_step(child);
+		wake_up_process(child);
+		/* make sure the single step bit is not set. */
+		break;
+
+	case PTRACE_SINGLESTEP:  /* set the trap flag. */
+		ret = -EIO;
+		if ((unsigned long) data >= _NSIG)
+			break;
+		child->ptrace &= ~PT_TRACESYS;
+		child->exit_code = data;
+		set_single_step(child);
+		/* give it a chance to run. */
+		wake_up_process(child);
+		ret = 0;
+		break;
+
+	case PTRACE_DETACH:  /* detach a process that was attached. */
+		ret = -EIO;
+		if ((unsigned long) data >= _NSIG)
+			break;
+		child->ptrace &= ~(PT_PTRACED|PT_TRACESYS);
+		child->exit_code = data;
+		write_lock_irqsave(&tasklist_lock, flags);
+		REMOVE_LINKS(child);
+		child->p_pptr = child->p_opptr;
+		SET_LINKS(child);
+		write_unlock_irqrestore(&tasklist_lock, flags);
+		/* make sure the single step bit is not set. */
+		clear_single_step(child);
+		wake_up_process(child);
+		ret = 0;
+		break;
+	case PTRACE_PEEKUSR_AREA:
+	case PTRACE_POKEUSR_AREA:
+		{
+		ptrace_area_emu31 * parea31 = (void *)addr;
+		if (!access_ok(VERIFY_READ, parea31, sizeof(*parea31)))
+			return(-EFAULT);
+		ret = __get_user(parea.len, &parea31->len);
+		ret |= __get_user(parea.kernel_addr, &parea31->kernel_addr);
+		ret |= __get_user(parea.process_addr, &parea31->process_addr);
+		if(ret==0)  
+		   ret=copy_user(child,parea.kernel_addr,parea.process_addr,
+				 parea.len,1,(request==PTRACE_POKEUSR_AREA));
+		break;
+		}
+	default:
+		ret = -EIO;
+		break;
+	}
+ out:
+	unlock_kernel();
+	return ret;
+}
+
+asmlinkage void syscall_trace(void)
+{
+	lock_kernel();
+	if ((current->ptrace & (PT_PTRACED|PT_TRACESYS))
+	    != (PT_PTRACED|PT_TRACESYS))
+		goto out;
+	current->exit_code = SIGTRAP;
+	set_current_state(TASK_STOPPED);
+	notify_parent(current, SIGCHLD);
+	schedule();
+	/*
+	 * this isn't the same as continuing with a signal, but it will do
+	 * for normal use.  strace only continues with a signal if the
+	 * stopping signal is not SIGTRAP.  -brl
+	 */
+	if (current->exit_code) {
+		send_sig(current->exit_code, current, 1);
+		current->exit_code = 0;
+	}
+ out:
+	unlock_kernel();
+}