openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: use sizeof(long) to unify signal_32|64.c 

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Harvey Harrison 2008-02-08 12:10:00 -08:00 committed by Ingo Molnar
parent 1a1768039c
commit 2d19c45806
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/signal_32.c
View File

@ -214,11 +214,12 @@ asmlinkage int sys_sigreturn(unsigned long __unused)
asmlinkage int sys_rt_sigreturn(unsigned long __unused) asmlinkage int sys_rt_sigreturn(unsigned long __unused)
{ {
struct pt_regs *regs = (struct pt_regs *) &__unused; struct pt_regs *regs = (struct pt_regs *)&__unused;
struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(regs->sp - 4); struct rt_sigframe __user *frame;
sigset_t set; sigset_t set;
int ax; int ax;
frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long));
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe; goto badframe;
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

8
arch/x86/kernel/signal_64.c
View File

@ -133,13 +133,11 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
sigset_t set; sigset_t set;
unsigned long ax; unsigned long ax;
frame = (struct rt_sigframe __user *)(regs->sp - 8); frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long));
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) { if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe; goto badframe;
} if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) {
goto badframe; goto badframe;
}
sigdelsetmask(&set, ~_BLOCKABLE); sigdelsetmask(&set, ~_BLOCKABLE);
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);