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

Commit 227195d4 authored by Roland McGrath's avatar Roland McGrath Committed by Ingo Molnar
Browse files

x86-32: ptrace generic resume 



This removes the handling for PTRACE_CONT et al from the 32-bit
ptrace code, so it uses the new generic code via ptrace_request.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 18982c15

arch/x86/kernel/ptrace_32.c

+0 −57
Original line number Diff line number Diff line
@@ -277,63 +277,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		  }

		  break;



	case PTRACE_SYSEMU: /* continue and stop at next syscall, which will not be executed */

	case PTRACE_SYSCALL:	/* continue and stop at next (return from) syscall */

	case PTRACE_CONT:	/* restart after signal. */

		ret = -EIO;

		if (!valid_signal(data))

			break;

		if (request == PTRACE_SYSEMU) {

			set_tsk_thread_flag(child, TIF_SYSCALL_EMU);

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		} else if (request == PTRACE_SYSCALL) {

			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

			clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);

		} else {

			clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		}

		child->exit_code = data;

		/* make sure the single step bit is not set. */

		user_disable_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->exit_state == EXIT_ZOMBIE)	/* already dead */

			break;

		child->exit_code = SIGKILL;

		/* make sure the single step bit is not set. */

		user_disable_single_step(child);

		wake_up_process(child);

		break;



	case PTRACE_SYSEMU_SINGLESTEP: /* Same as SYSEMU, but singlestep if not syscall */

	case PTRACE_SINGLESTEP:	/* set the trap flag. */

		ret = -EIO;

		if (!valid_signal(data))

			break;



		if (request == PTRACE_SYSEMU_SINGLESTEP)

			set_tsk_thread_flag(child, TIF_SYSCALL_EMU);

		else

			clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);



		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		user_enable_single_step(child);

		child->exit_code = data;

		/* give it a chance to run. */

		wake_up_process(child);

		ret = 0;

		break;



	case PTRACE_GETREGS: { /* Get all gp regs from the child. */

	  	if (!access_ok(VERIFY_WRITE, datap, FRAME_SIZE*sizeof(long))) {

			ret = -EIO;