Commit 129bc8f7 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Setup_frame is now returning a success value. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b490ff42

arch/mips/kernel/process.c

+5 −5
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ extern int do_signal32(sigset_t *oldset, struct pt_regs *regs); 
/*

 * Native o32 and N64 ABI without DSP ASE

 */

extern void setup_frame(struct k_sigaction * ka, struct pt_regs *regs,

extern int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,

        int signr, sigset_t *set);

extern void setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,

extern int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,

        int signr, sigset_t *set, siginfo_t *info);



struct mips_abi mips_abi = {
@@ -79,9 +79,9 @@ struct mips_abi mips_abi = { 
/*

 * o32 compatibility on 64-bit kernels, without DSP ASE

 */

extern void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,

extern int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,

        int signr, sigset_t *set);

extern void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,

extern int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,

        int signr, sigset_t *set, siginfo_t *info);



struct mips_abi mips_abi_32 = {
@@ -95,7 +95,7 @@ struct mips_abi mips_abi_32 = { 
/*

 * N32 on 64-bit kernels, without DSP ASE

 */

extern void setup_rt_frame_n32(struct k_sigaction * ka, struct pt_regs *regs,

extern int setup_rt_frame_n32(struct k_sigaction * ka, struct pt_regs *regs,

        int signr, sigset_t *set, siginfo_t *info);



struct mips_abi mips_abi_n32 = {

arch/mips/kernel/signal.c

+15 −11
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ badframe: 
}



#ifdef CONFIG_TRAD_SIGNALS

void setup_frame(struct k_sigaction * ka, struct pt_regs *regs,

int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,

	int signr, sigset_t *set)

{

	struct sigframe *frame;
@@ -317,14 +317,15 @@ void setup_frame(struct k_sigaction * ka, struct pt_regs *regs, 
	       current->comm, current->pid,

	       frame, regs->cp0_epc, frame->regs[31]);

#endif

        return;

        return 1;



give_sigsegv:

	force_sigsegv(signr, current);

	return 0;

}

#endif



void setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,

int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,

	int signr, sigset_t *set, siginfo_t *info)

{

	struct rt_sigframe *frame;
@@ -376,18 +377,21 @@ void setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, 
	       current->comm, current->pid,

	       frame, regs->cp0_epc, regs->regs[31]);

#endif

	return;

	return 1;



give_sigsegv:

	force_sigsegv(signr, current);

	return 0;

}



extern void setup_rt_frame_n32(struct k_sigaction * ka,

	struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);



static inline void handle_signal(unsigned long sig, siginfo_t *info,

static inline int handle_signal(unsigned long sig, siginfo_t *info,

	struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)

{

	int ret;



	switch(regs->regs[0]) {

	case ERESTART_RESTARTBLOCK:

	case ERESTARTNOHAND:
@@ -407,9 +411,9 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info, 
	regs->regs[0] = 0;		/* Don't deal with this again.  */



	if (sig_uses_siginfo(ka))

		current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);

		ret = current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);

	else

		current->thread.abi->setup_frame(ka, regs, sig, oldset);

		ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);



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

	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
@@ -417,6 +421,8 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info, 
		sigaddset(&current->blocked,sig);

	recalc_sigpending();

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



	return ret;

}



int do_signal(sigset_t *oldset, struct pt_regs *regs)
@@ -440,10 +446,8 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) 
		oldset = &current->blocked;



	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (signr > 0) {

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

		return 1;

	}

	if (signr > 0)

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



no_signal:

	/*

arch/mips/kernel/signal32.c

+9 −7
Original line number Diff line number Diff line
@@ -769,9 +769,11 @@ give_sigsegv: 
	force_sigsegv(signr, current);

}



static inline void handle_signal(unsigned long sig, siginfo_t *info,

static inline int handle_signal(unsigned long sig, siginfo_t *info,

	struct k_sigaction *ka, sigset_t *oldset, struct pt_regs * regs)

{

	int ret;



	switch (regs->regs[0]) {

	case ERESTART_RESTARTBLOCK:

	case ERESTARTNOHAND:
@@ -791,9 +793,9 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info, 
	regs->regs[0] = 0;		/* Don't deal with this again.  */



	if (ka->sa.sa_flags & SA_SIGINFO)

		current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);

		ret = current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);

	else

		current->thread.abi->setup_frame(ka, regs, sig, oldset);

		ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);



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

	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
@@ -801,6 +803,8 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info, 
		sigaddset(&current->blocked,sig);

	recalc_sigpending();

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



	return ret;

}



int do_signal32(sigset_t *oldset, struct pt_regs *regs)
@@ -824,10 +828,8 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs) 
		oldset = &current->blocked;



	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (signr > 0) {

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

		return 1;

	}

	if (signr > 0)

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



no_signal:

	/*

arch/mips/kernel/signal_n32.c

+3 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ badframe: 
	force_sig(SIGSEGV, current);

}



void setup_rt_frame_n32(struct k_sigaction * ka,

int setup_rt_frame_n32(struct k_sigaction * ka,

	struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info)

{

	struct rt_sigframe_n32 *frame;
@@ -184,8 +184,9 @@ void setup_rt_frame_n32(struct k_sigaction * ka, 
	       current->comm, current->pid,

	       frame, regs->cp0_epc, regs->regs[31]);

#endif

	return;

	return 1;



give_sigsegv:

	force_sigsegv(signr, current);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE