[SCSI] correct some dropped const compiler warnings

[pandora-kernel.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 019e04e..656476e 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -56,6 +56,10 @@ void ptrace_untrace(task_t *child)
                        signal_wake_up(child, 1);
                }
        }
+       if (child->signal->flags & SIGNAL_GROUP_EXIT) {
+               sigaddset(&child->pending.signal, SIGKILL);
+               signal_wake_up(child, 1);
+       }
        spin_unlock(&child->sighand->siglock);
 }
 
@@ -77,8 +81,7 @@ void __ptrace_unlink(task_t *child)
                SET_LINKS(child);
        }
 
-       if (child->state == TASK_TRACED)
-               ptrace_untrace(child);
+       ptrace_untrace(child);
 }
 
 /*
@@ -152,7 +155,7 @@ int ptrace_attach(struct task_struct *task)
        retval = -EPERM;
        if (task->pid <= 1)
                goto bad;
-       if (task == current)
+       if (task->tgid == current->tgid)
                goto bad;
        /* the same process cannot be attached many times */
        if (task->ptrace & PT_PTRACED)
@@ -238,7 +241,8 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
                if (write) {
                        copy_to_user_page(vma, page, addr,
                                          maddr + offset, buf, bytes);
-                       set_page_dirty_lock(page);
+                       if (!PageCompound(page))
+                               set_page_dirty_lock(page);
                } else {
                        copy_from_user_page(vma, page, addr,
                                            buf, maddr + offset, bytes);
@@ -403,3 +407,85 @@ int ptrace_request(struct task_struct *child, long request,
 
        return ret;
 }
+
+#ifndef __ARCH_SYS_PTRACE
+static int ptrace_get_task_struct(long request, long pid,
+               struct task_struct **childp)
+{
+       struct task_struct *child;
+       int ret;
+
+       /*
+        * Callers use child == NULL as an indication to exit early even
+        * when the return value is 0, so make sure it is non-NULL here.
+        */
+       *childp = NULL;
+
+       if (request == PTRACE_TRACEME) {
+               /*
+                * Are we already being traced?
+                */
+               if (current->ptrace & PT_PTRACED)
+                       return -EPERM;
+               ret = security_ptrace(current->parent, current);
+               if (ret)
+                       return -EPERM;
+               /*
+                * Set the ptrace bit in the process ptrace flags.
+                */
+               current->ptrace |= PT_PTRACED;
+               return 0;
+       }
+
+       /*
+        * You may not mess with init
+        */
+       if (pid == 1)
+               return -EPERM;
+
+       ret = -ESRCH;
+       read_lock(&tasklist_lock);
+       child = find_task_by_pid(pid);
+       if (child)
+               get_task_struct(child);
+       read_unlock(&tasklist_lock);
+       if (!child)
+               return -ESRCH;
+
+       *childp = child;
+       return 0;
+}
+
+asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
+{
+       struct task_struct *child;
+       long ret;
+
+       /*
+        * This lock_kernel fixes a subtle race with suid exec
+        */
+       lock_kernel();
+       ret = ptrace_get_task_struct(request, pid, &child);
+       if (!child)
+               goto out;
+
+       if (request == PTRACE_ATTACH) {
+               ret = ptrace_attach(child);
+               goto out_put_task_struct;
+       }
+
+       ret = ptrace_check_attach(child, request == PTRACE_KILL);
+       if (ret < 0)
+               goto out_put_task_struct;
+
+       ret = arch_ptrace(child, request, addr, data);
+       if (ret < 0)
+               goto out_put_task_struct;
+
+ out_put_task_struct:
+       put_task_struct(child);
+ out:
+       unlock_kernel();
+       return ret;
+}
+#endif /* __ARCH_SYS_PTRACE */