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

Commit 2ba48e16 authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: signal: remove unneeded err handling 



This patch eliminates unused or unneeded variable handling.

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3d0aedd9

arch/x86/ia32/ia32_signal.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -446,18 +446,15 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, 
	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))

	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))

		return -EFAULT;

		return -EFAULT;





	err |= __put_user(sig, &frame->sig);

	if (__put_user(sig, &frame->sig))

	if (err)

		return -EFAULT;

		return -EFAULT;





	err |= ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]);

	if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))

	if (err)

		return -EFAULT;

		return -EFAULT;





	if (_COMPAT_NSIG_WORDS > 1) {

	if (_COMPAT_NSIG_WORDS > 1) {

		err |= __copy_to_user(frame->extramask, &set->sig[1],

		if (__copy_to_user(frame->extramask, &set->sig[1],

				      sizeof(frame->extramask));

				   sizeof(frame->extramask)))

		if (err)

			return -EFAULT;

			return -EFAULT;

	}

	}

arch/x86/kernel/signal_32.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -351,18 +351,15 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, 
	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))

	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))

		return -EFAULT;

		return -EFAULT;





	err = __put_user(sig, &frame->sig);

	if (__put_user(sig, &frame->sig))

	if (err)

		return -EFAULT;

		return -EFAULT;





	err = setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]);

	if (setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))

	if (err)

		return -EFAULT;

		return -EFAULT;





	if (_NSIG_WORDS > 1) {

	if (_NSIG_WORDS > 1) {

		err = __copy_to_user(&frame->extramask, &set->sig[1],

		if (__copy_to_user(&frame->extramask, &set->sig[1],

				      sizeof(frame->extramask));

				   sizeof(frame->extramask)))

		if (err)

			return -EFAULT;

			return -EFAULT;

	}

	}

arch/x86/kernel/signal_64.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
			(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;

			(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;





		if (save_i387_xstate(fp) < 0)

		if (save_i387_xstate(fp) < 0)

			err |= -1;

			return -EFAULT;

	} else

	} else

		frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;

		frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;
@@ -218,8 +218,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
		return -EFAULT;

		return -EFAULT;





	if (ka->sa.sa_flags & SA_SIGINFO) {

	if (ka->sa.sa_flags & SA_SIGINFO) {

		err |= copy_siginfo_to_user(&frame->info, info);

		if (copy_siginfo_to_user(&frame->info, info))

		if (err)

			return -EFAULT;

			return -EFAULT;

	}

	}