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

Commit 391c62fe authored by Heiko Carstens's avatar Heiko Carstens
Browse files

[S390] signal: convert to use set_current_blocked() 



Convert to use set_current_blocked() like x86.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 7a0e42f1

arch/s390/kernel/compat_signal.c

+12 −31
Original line number Diff line number Diff line
@@ -380,20 +380,13 @@ asmlinkage long sys32_sigreturn(void) 
		goto badframe;

	if (__copy_from_user(&set.sig, &frame->sc.oldmask, _SIGMASK_COPY_SIZE32))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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



	set_current_blocked(&set);

	if (restore_sigregs32(regs, &frame->sregs))

		goto badframe;

	if (restore_sigregs_gprs_high(regs, frame->gprs_high))

		goto badframe;



	return regs->gprs[2];



badframe:

	force_sig(SIGSEGV, current);

	return 0;
@@ -413,31 +406,22 @@ asmlinkage long sys32_rt_sigreturn(void) 
		goto badframe;

	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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



	set_current_blocked(&set);

	if (restore_sigregs32(regs, &frame->uc.uc_mcontext))

		goto badframe;

	if (restore_sigregs_gprs_high(regs, frame->gprs_high))

		goto badframe;



	err = __get_user(ss_sp, &frame->uc.uc_stack.ss_sp);

	st.ss_sp = compat_ptr(ss_sp);

	err |= __get_user(st.ss_size, &frame->uc.uc_stack.ss_size);

	err |= __get_user(st.ss_flags, &frame->uc.uc_stack.ss_flags);

	if (err)

		goto badframe; 



	set_fs (KERNEL_DS);

	do_sigaltstack((stack_t __force __user *)&st, NULL, regs->gprs[15]);

	set_fs (old_fs);



	return regs->gprs[2];



badframe:

	force_sig(SIGSEGV, current);

	return 0;
@@ -605,10 +589,10 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
 * OK, we're invoking a handler

 */	



int

handle_signal32(unsigned long sig, struct k_sigaction *ka,

int handle_signal32(unsigned long sig, struct k_sigaction *ka,

		    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)

{

	sigset_t blocked;

	int ret;



	/* Set up the stack frame */
@@ -616,15 +600,12 @@ handle_signal32(unsigned long sig, struct k_sigaction *ka, 
		ret = setup_rt_frame32(sig, ka, info, oldset, regs);

	else

		ret = setup_frame32(sig, ka, oldset, regs);



	if (ret == 0) {

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

		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);

		if (!(ka->sa.sa_flags & SA_NODEFER))

			sigaddset(&current->blocked,sig);

		recalc_sigpending();

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

	}

	if (ret)

		return ret;

	sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);

	if (!(ka->sa.sa_flags & SA_NODEFER))

		sigaddset(&blocked, sig);

	set_current_blocked(&blocked);

	return 0;

}

arch/s390/kernel/signal.c

+18 −41
Original line number Diff line number Diff line
@@ -57,17 +57,15 @@ typedef struct 
 */

SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask)

{

	mask &= _BLOCKABLE;

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

	current->saved_sigmask = current->blocked;

	siginitset(&current->blocked, mask);

	recalc_sigpending();

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

	sigset_t blocked;



	current->saved_sigmask = current->blocked;

	mask &= _BLOCKABLE;

	siginitset(&blocked, mask);

	set_current_blocked(&blocked);

	set_current_state(TASK_INTERRUPTIBLE);

	schedule();

	set_thread_flag(TIF_RESTORE_SIGMASK);



	return -ERESTARTNOHAND;

}
@@ -172,18 +170,11 @@ SYSCALL_DEFINE0(sigreturn) 
		goto badframe;

	if (__copy_from_user(&set.sig, &frame->sc.oldmask, _SIGMASK_COPY_SIZE))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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



	set_current_blocked(&set);

	if (restore_sigregs(regs, &frame->sregs))

		goto badframe;



	return regs->gprs[2];



badframe:

	force_sig(SIGSEGV, current);

	return 0;
@@ -199,21 +190,14 @@ SYSCALL_DEFINE0(rt_sigreturn) 
		goto badframe;

	if (__copy_from_user(&set.sig, &frame->uc.uc_sigmask, sizeof(set)))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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



	set_current_blocked(&set);

	if (restore_sigregs(regs, &frame->uc.uc_mcontext))

		goto badframe;



	if (do_sigaltstack(&frame->uc.uc_stack, NULL,

			   regs->gprs[15]) == -EFAULT)

		goto badframe;

	return regs->gprs[2];



badframe:

	force_sig(SIGSEGV, current);

	return 0;
@@ -385,14 +369,11 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	return -EFAULT;

}



/*

 * OK, we're invoking a handler

 */	



static int

handle_signal(unsigned long sig, struct k_sigaction *ka,

	      siginfo_t *info, sigset_t *oldset, struct pt_regs * regs)

static int handle_signal(unsigned long sig, struct k_sigaction *ka,

			 siginfo_t *info, sigset_t *oldset,

			 struct pt_regs *regs)

{

	sigset_t blocked;

	int ret;



	/* Set up the stack frame */
@@ -400,17 +381,13 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, 
		ret = setup_rt_frame(sig, ka, info, oldset, regs);

	else

		ret = setup_frame(sig, ka, oldset, regs);



	if (ret == 0) {

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

		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);

		if (!(ka->sa.sa_flags & SA_NODEFER))

			sigaddset(&current->blocked,sig);

		recalc_sigpending();

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

	}



	if (ret)

		return ret;

	sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);

	if (!(ka->sa.sa_flags & SA_NODEFER))

		sigaddset(&blocked, sig);

	set_current_blocked(&blocked);

	return 0;

}



/*