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

Commit d1574df7 authored by Al Viro's avatar Al Viro Committed by Geert Uytterhoeven
Browse files

m68knommu: Handle multiple pending signals 



we shouldn't bugger off to userland when there still are
pending signals; among other things it makes e.g. SIGSEGV
triggered by failure to build a sigframe to be delivered
_now_ and not when we hit the next syscall or interrupt.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 710e91e4

arch/m68knommu/kernel/signal.c

+3 −4
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info, 
 * want to handle. Thus you cannot kill init even with a SIGKILL even by

 * mistake.

 */

asmlinkage int do_signal(struct pt_regs *regs)

asmlinkage void do_signal(struct pt_regs *regs)

{

	struct k_sigaction ka;

	siginfo_t info;
@@ -731,7 +731,7 @@ asmlinkage int do_signal(struct pt_regs *regs) 
	 * if so.

	 */

	if (!user_mode(regs))

		return 1;

		return;



	if (test_thread_flag(TIF_RESTORE_SIGMASK))

		oldset = &current->saved_sigmask;
@@ -743,7 +743,7 @@ asmlinkage int do_signal(struct pt_regs *regs) 
		/* Whee!  Actually deliver the signal.  */

		handle_signal(signr, &ka, &info, oldset, regs);

		clear_thread_flag(TIF_RESTORE_SIGMASK);

		return 1;

		return;

	}



	/* Did we come from a system call? */
@@ -757,5 +757,4 @@ asmlinkage int do_signal(struct pt_regs *regs) 
		clear_thread_flag(TIF_RESTORE_SIGMASK);

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

	}

	return 0;

}

arch/m68knommu/platform/68328/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ Luser_return: 
	movel	%sp,%d1			/* get thread_info pointer */

	andl	#-THREAD_SIZE,%d1

	movel	%d1,%a2

1:

	move	%a2@(TI_FLAGS),%d1	/* thread_info->flags */

	andl	#_TIF_WORK_MASK,%d1

	jne	Lwork_to_do
@@ -124,8 +125,7 @@ Lsignal_return: 
	addql	#4,%sp

	RESTORE_SWITCH_STACK

	addql	#4,%sp

Lreturn:

	RESTORE_ALL

	jra	1b



/*

 * This is the main interrupt handler, responsible for calling process_int()

arch/m68knommu/platform/68360/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Luser_return: 
	movel	%sp,%d1			/* get thread_info pointer */

	andl	#-THREAD_SIZE,%d1

	movel	%d1,%a2

1:

	move	%a2@(TI_FLAGS),%d1	/* thread_info->flags */

	andl	#_TIF_WORK_MASK,%d1

	jne	Lwork_to_do
@@ -120,8 +121,7 @@ Lsignal_return: 
	addql	#4,%sp

	RESTORE_SWITCH_STACK

	addql	#4,%sp

Lreturn:

	RESTORE_ALL

	jra	1b



/*

 * This is the main interrupt handler, responsible for calling do_IRQ()

arch/m68knommu/platform/coldfire/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ Lsignal_return: 
	addql	#4,%sp

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	jmp	Lreturn

	jmp	Luser_return



/*

 * This is the generic interrupt handler (for all hardware interrupt