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

Commit 2d19c458 authored Feb 08, 2008 by Harvey Harrison Committed by Ingo Molnar Apr 17, 2008

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>

parent 1a176803

arch/x86/kernel/signal_32.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -215,10 +215,11 @@ asmlinkage int sys_sigreturn(unsigned long __unused)
		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 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

Original line number	Diff line number	Diff line
		@@ -133,13 +133,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(&current->sighand->siglock);