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

Commit 36a03308 authored by Roland McGrath's avatar Roland McGrath
Browse files

x86: tracehook_signal_handler 



This makes the x86 signal handling code use tracehook_signal_handler() in
place of calling into ptrace guts.  The call is moved after the sa_mask
processing, but there is no other change.  This cleanup doesn't matter to
existing debuggers, but is the sensible thing: have all facets of the
handler setup complete before the debugger inspects the task again.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
parent a048d3af

arch/x86/kernel/signal_32.c

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/wait.h>

#include <linux/tracehook.h>

#include <linux/elf.h>

#include <linux/smp.h>

#include <linux/mm.h>
@@ -558,8 +559,6 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	 * handler too.

	 */

	regs->flags &= ~X86_EFLAGS_TF;

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);



	spin_lock_irq(&current->sighand->siglock);

	sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
@@ -568,6 +567,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);



	tracehook_signal_handler(sig, info, ka, regs,

				 test_thread_flag(TIF_SINGLESTEP));



	return 0;

}

arch/x86/kernel/signal_64.c

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/errno.h>

#include <linux/wait.h>

#include <linux/ptrace.h>

#include <linux/tracehook.h>

#include <linux/unistd.h>

#include <linux/stddef.h>

#include <linux/personality.h>
@@ -444,8 +445,6 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
		 * handler too.

		 */

		regs->flags &= ~X86_EFLAGS_TF;

		if (test_thread_flag(TIF_SINGLESTEP))

			ptrace_notify(SIGTRAP);



		spin_lock_irq(&current->sighand->siglock);

		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
@@ -453,6 +452,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
			sigaddset(&current->blocked,sig);

		recalc_sigpending();

		spin_unlock_irq(&current->sighand->siglock);



		tracehook_signal_handler(sig, info, ka, regs,

					 test_thread_flag(TIF_SINGLESTEP));

	}



	return ret;