mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

arm64: Use sigsp()

Browse source 
Use sigsp() instead of the open coded variant.

Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Richard Weinberger 2014-03-05 13:31:20 +01:00 committed by Richard Weinberger
parent 5290dd79c0
commit 38a7be3c28
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm64/kernel/signal.c
View file

@ -209,19 +209,13 @@ static int setup_sigframe(struct rt_sigframe __user *sf,
return err; return err;
} }
static struct rt_sigframe __user *get_sigframe(struct k_sigaction *ka, static struct rt_sigframe __user *get_sigframe(struct ksignal *ksig,
struct pt_regs *regs) struct pt_regs *regs)
{ {
unsigned long sp, sp_top; unsigned long sp, sp_top;
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
sp = sp_top = regs->sp; sp = sp_top = sigsp(regs->sp, ksig);
/*
* This is the X/Open sanctioned signal stack switching.
*/
if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
sp = sp_top = current->sas_ss_sp + current->sas_ss_size;
sp = (sp - sizeof(struct rt_sigframe)) & ~15; sp = (sp - sizeof(struct rt_sigframe)) & ~15;
frame = (struct rt_sigframe __user *)sp; frame = (struct rt_sigframe __user *)sp;
@ -259,7 +253,7 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(&ksig->ka, regs); frame = get_sigframe(ksig, regs);
if (!frame) if (!frame)
return 1; return 1;

14
arch/arm64/kernel/signal32.c
View file

@ -407,19 +407,13 @@ asmlinkage int compat_sys_rt_sigreturn(struct pt_regs *regs)
return 0; return 0;
} }
static void __user *compat_get_sigframe(struct k_sigaction *ka, static void __user *compat_get_sigframe(struct ksignal *ksig,
struct pt_regs *regs, struct pt_regs *regs,
int framesize) int framesize)
{ {
compat_ulong_t sp = regs->compat_sp; compat_ulong_t sp = sigsp(regs->compat_sp, ksig);
void __user *frame; void __user *frame;
/*
* This is the X/Open sanctioned signal stack switching.
*/
if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;
/* /*
* ATPCS B01 mandates 8-byte alignment * ATPCS B01 mandates 8-byte alignment
*/ */
@ -526,7 +520,7 @@ int compat_setup_rt_frame(int usig, struct ksignal *ksig,
struct compat_rt_sigframe __user *frame; struct compat_rt_sigframe __user *frame;
int err = 0; int err = 0;
frame = compat_get_sigframe(&ksig->ka, regs, sizeof(*frame)); frame = compat_get_sigframe(ksig, regs, sizeof(*frame));
if (!frame) if (!frame)
return 1; return 1;
@ -555,7 +549,7 @@ int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
struct compat_sigframe __user *frame; struct compat_sigframe __user *frame;
int err = 0; int err = 0;
frame = compat_get_sigframe(&ksig->ka, regs, sizeof(*frame)); frame = compat_get_sigframe(ksig, regs, sizeof(*frame));
if (!frame) if (!frame)
return 1; return 1;