vserver 1.9.5.x5

[linux-2.6.git] / arch / h8300 / kernel / ptrace.c

diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c
index 0843013..7e5cce3 100644 (file)
--- a/arch/h8300/kernel/ptrace.c
+++ b/arch/h8300/kernel/ptrace.c
@@ -80,6 +80,8 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
        read_unlock(&tasklist_lock);
        if (!child)
                goto out;
+       if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
+               goto out_tsk;
 
        ret = -EPERM;
        if (pid == 1)           /* you may not mess with init */
@@ -89,13 +91,6 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
                ret = ptrace_attach(child);
                goto out_tsk;
        }
-       ret = -ESRCH;
-       if (!(child->ptrace & PT_PTRACED))
-               goto out_tsk;
-       if (child->state != TASK_STOPPED) {
-               if (request != PTRACE_KILL)
-                       goto out_tsk;
-       }
        ret = ptrace_check_attach(child, request == PTRACE_KILL);
        if (ret < 0)
                goto out_tsk;
@@ -114,20 +109,38 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
 
        /* read the word at location addr in the USER area. */
                case PTRACE_PEEKUSR: {
-                       unsigned long tmp;
+                       unsigned long tmp = 0;
                        
-                       if ((addr & 3) || addr < 0 || addr >= sizeof(struct user))
+                       if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) {
                                ret = -EIO;
+                               break ;
+                       }
                        
-                       tmp = 0;  /* Default return condition */
+                       ret = 0;  /* Default return condition */
                        addr = addr >> 2; /* temporary hack. */
+
                        if (addr < H8300_REGS_NO)
                                tmp = h8300_get_reg(child, addr);
                        else {
-                               ret = -EIO;
-                               break ;
+                               switch(addr) {
+                               case 49:
+                                       tmp = child->mm->start_code;
+                                       break ;
+                               case 50:
+                                       tmp = child->mm->start_data;
+                                       break ;
+                               case 51:
+                                       tmp = child->mm->end_code;
+                                       break ;
+                               case 52:
+                                       tmp = child->mm->end_data;
+                                       break ;
+                               default:
+                                       ret = -EIO;
+                               }
                        }
-                       ret = put_user(tmp,(unsigned long *) data);
+                       if (!ret)
+                               ret = put_user(tmp,(unsigned long *) data);
                        break ;
                }
 
@@ -181,7 +194,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
                case PTRACE_KILL: {
 
                        ret = 0;
-                       if (child->state == TASK_ZOMBIE) /* already dead */
+                       if (child->exit_state == EXIT_ZOMBIE) /* already dead */
                                break;
                        child->exit_code = SIGKILL;
                        h8300_disable_trace(child);
@@ -252,10 +265,8 @@ asmlinkage void syscall_trace(void)
                return;
        if (!(current->ptrace & PT_PTRACED))
                return;
-       current->exit_code = SIGTRAP;
-       current->state = TASK_STOPPED;
-       notify_parent(current, SIGCHLD);
-       schedule();
+       ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+                                ? 0x80 : 0));
        /*
         * 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