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

Commit 6b9c7ed8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] use ptrace_get_task_struct in various places 



The ptrace_get_task_struct() helper that I added as part of the ptrace
consolidation is useful in variety of places that currently opencode it.
Switch them to the common helpers.

Add a ptrace_traceme() helper that needs to be explicitly called, and simplify
the ptrace_get_task_struct() interface.  We don't need the request argument
now, and we return the task_struct directly, using ERR_PTR() for error
returns.  It's a bit more code in the callers, but we have two sane routines
that do one thing well now.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6b34350f

arch/alpha/kernel/ptrace.c

+5 −19
Original line number Diff line number Diff line
@@ -265,30 +265,16 @@ do_sys_ptrace(long request, long pid, long addr, long data, 
	lock_kernel();

	DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n",

		      request, pid, addr, data));

	ret = -EPERM;

	if (request == PTRACE_TRACEME) {

		/* are we already being traced? */

		if (current->ptrace & PT_PTRACED)

			goto out_notsk;

		ret = security_ptrace(current->parent, current);

		if (ret)

			goto out_notsk;

		/* set the ptrace bit in the process ptrace flags. */

		current->ptrace |= PT_PTRACED;

		ret = 0;

		ret = ptrace_traceme();

		goto out_notsk;

	}

	if (pid == 1)		/* you may not mess with init */

		goto out_notsk;



	ret = -ESRCH;

	read_lock(&tasklist_lock);

	child = find_task_by_pid(pid);

	if (child)

		get_task_struct(child);

	read_unlock(&tasklist_lock);

	if (!child)

	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out_notsk;

	}



	if (request == PTRACE_ATTACH) {

		ret = ptrace_attach(child);

arch/ia64/ia32/sys_ia32.c

+5 −11
Original line number Diff line number Diff line
@@ -1761,21 +1761,15 @@ sys32_ptrace (int request, pid_t pid, unsigned int addr, unsigned int data) 


	lock_kernel();

	if (request == PTRACE_TRACEME) {

		ret = sys_ptrace(request, pid, addr, data);

		ret = ptrace_traceme();

		goto out;

	}



	ret = -ESRCH;

	read_lock(&tasklist_lock);

	child = find_task_by_pid(pid);

	if (child)

		get_task_struct(child);

	read_unlock(&tasklist_lock);

	if (!child)

	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out;

	ret = -EPERM;

	if (pid == 1)		/* no messing around with init! */

		goto out_tsk;

	}



	if (request == PTRACE_ATTACH) {

		ret = sys_ptrace(request, pid, addr, data);

arch/ia64/kernel/ptrace.c

+1 −8
Original line number Diff line number Diff line
@@ -1422,14 +1422,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data) 
	lock_kernel();

	ret = -EPERM;

	if (request == PTRACE_TRACEME) {

		/* are we already being traced? */

		if (current->ptrace & PT_PTRACED)

			goto out;

		ret = security_ptrace(current->parent, current);

		if (ret)

			goto out;

		current->ptrace |= PT_PTRACED;

		ret = 0;

		ret = ptrace_traceme();

		goto out;

	}

arch/m32r/kernel/ptrace.c

+5 −17
Original line number Diff line number Diff line
@@ -762,28 +762,16 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data) 
	int ret;



	lock_kernel();

	ret = -EPERM;

	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;

		ret = ptrace_traceme();

		goto out;

	}

	ret = -ESRCH;

	read_lock(&tasklist_lock);

	child = find_task_by_pid(pid);

	if (child)

		get_task_struct(child);

	read_unlock(&tasklist_lock);

	if (!child)

		goto out;



	ret = -EPERM;

	if (pid == 1)		/* you may not mess with init */

	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out;

	}



	if (request == PTRACE_ATTACH) {

		ret = ptrace_attach(child);

arch/mips/kernel/ptrace32.c

+6 −20
Original line number Diff line number Diff line
@@ -57,30 +57,16 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
	       (unsigned long) data);

#endif

	lock_kernel();

	ret = -EPERM;

	if (request == PTRACE_TRACEME) {

		/* are we already being traced? */

		if (current->ptrace & PT_PTRACED)

			goto out;

		if ((ret = security_ptrace(current->parent, current)))

			goto out;

		/* set the ptrace bit in the process flags. */

		current->ptrace |= PT_PTRACED;

		ret = 0;

		ret = ptrace_traceme();

		goto out;

	}

	ret = -ESRCH;

	read_lock(&tasklist_lock);

	child = find_task_by_pid(pid);

	if (child)

		get_task_struct(child);

	read_unlock(&tasklist_lock);

	if (!child)

		goto out;



	ret = -EPERM;

	if (pid == 1)		/* you may not mess with init */

		goto out_tsk;

	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out;

	}



	if (request == PTRACE_ATTACH) {

		ret = ptrace_attach(child);