x86: use sizeof(long) to unify signal_32|64.c
PATCH 6/9 x86: use sizeof(long) to unify signal_32|64.c
Use sizeof(long) instead of hardcoded 4 and 8 in offset subtraction. Clean up small bracketing/trailing space while we're here.
Signed-off-by Harvey Harrison <[email protected]>
--- arch/x86/kernel/signal_32.c | 5 +++-- arch/x86/kernel/signal_64.c | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-)
arch/x86/kernel/signal_32.c +3 -2
@@ -215,11 +215,12 @@ badframe: asmlinkage int sys_rt_sigreturn(unsigned long __unused) { -struct pt_regs *regs = (struct pt_regs *) &__unused; -struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(regs->sp -4 ); +struct pt_regs *regs = (struct pt_regs *)&__unused; +struct rt_sigframe __user *frame;sigset_t set;int ax; + frame = (struct rt_sigframe __user *)(regs->sp -sizeof (long ));if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) goto badframe;if (__copy_from_user (&set, &frame->uc.uc_sigmask,sizeof (set)))
arch/x86/kernel/signal_64.c +3 -5
@@ -134,13 +134,11 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)sigset_t set;unsigned long ax; - frame = (struct rt_sigframe __user *)(regs->sp -8 ); -if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) { + frame = (struct rt_sigframe __user *)(regs->sp -sizeof (long )); +if (!access_ok (VERIFY_READ , frame,sizeof (*frame))) 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; - }sigdelsetmask (&set, ~_BLOCKABLE);spin_lock_irq (¤t->sighand->siglock);
Signature · 1 line
1.5.4.1219.g65b9