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

Commit bba7fc0a authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa 



avr32, mn10300, parisc, s390, sh, xtensa:

They never set PT_DTRACE, but clear it after do_execve().

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarChris Zankel <chris@zankel.net>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Acked-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 02e78749

arch/avr32/kernel/process.c

+0 −2
Original line number Diff line number Diff line
@@ -394,8 +394,6 @@ asmlinkage int sys_execve(char __user *ufilename, char __user *__user *uargv, 
		goto out;



	error = do_execve(filename, uargv, uenvp, regs);

	if (error == 0)

		current->ptrace &= ~PT_DTRACE;

	putname(filename);



out:

arch/mn10300/kernel/process.c

+0 −3
Original line number Diff line number Diff line
@@ -281,9 +281,6 @@ asmlinkage long sys_execve(char __user *name, 
	error = PTR_ERR(filename);

	if (!IS_ERR(filename)) {

		error = do_execve(filename, argv, envp, __frame);

		if (error == 0)

			current->ptrace &= ~PT_DTRACE;



		putname(filename);

	}

arch/parisc/hpux/fs.c

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ int hpux_execve(struct pt_regs *regs) 
	error = do_execve(filename, (char __user * __user *) regs->gr[25],

		(char __user * __user *) regs->gr[24], regs);



	if (error == 0) {

		task_lock(current);

		current->ptrace &= ~PT_DTRACE;

		task_unlock(current);

	}

	putname(filename);



out:

arch/parisc/kernel/process.c

+0 −5
Original line number Diff line number Diff line
@@ -349,11 +349,6 @@ asmlinkage int sys_execve(struct pt_regs *regs) 
		goto out;

	error = do_execve(filename, (char __user * __user *) regs->gr[25],

		(char __user * __user *) regs->gr[24], regs);

	if (error == 0) {

		task_lock(current);

		current->ptrace &= ~PT_DTRACE;

		task_unlock(current);

	}

	putname(filename);

out:

arch/parisc/kernel/sys_parisc32.c

+0 −5
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ asmlinkage int sys32_execve(struct pt_regs *regs) 
		goto out;

	error = compat_do_execve(filename, compat_ptr(regs->gr[25]),

				 compat_ptr(regs->gr[24]), regs);

	if (error == 0) {

		task_lock(current);

		current->ptrace &= ~PT_DTRACE;

		task_unlock(current);

	}

	putname(filename);

out: