h8300: don't change blocked signals' mask if setting frame up fails (8b6c3309) · Commits · e / devices / android_kernel_teracube_2e

arch/h8300/kernel/signal.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ get_sigframe(struct k_sigaction ka, struct pt_regs regs, size_t frame_size)
		return (void *)((usp - frame_size) & -8UL);
		}

		static void setup_frame (int sig, struct k_sigaction *ka,
		static int setup_frame (int sig, struct k_sigaction *ka,
		sigset_t set, struct pt_regs regs)
		{
		struct sigframe *frame;
		@@ -365,13 +365,14 @@ static void setup_frame (int sig, struct k_sigaction *ka,
		regs->er1 = (unsigned long)&(frame->sc);
		regs->er5 = current->mm->start_data; /* GOT base */

		return;
		return 0;

		give_sigsegv:
		force_sigsegv(sig, current);
		return -EFAULT;
		}

		static void setup_rt_frame (int sig, struct k_sigaction ka, siginfo_t info,
		static int setup_rt_frame (int sig, struct k_sigaction ka, siginfo_t info,
		sigset_t set, struct pt_regs regs)
		{
		struct rt_sigframe *frame;
		@@ -440,10 +441,11 @@ static void setup_rt_frame (int sig, struct k_sigaction ka, siginfo_t info,
		regs->er2 = (unsigned long)&frame->uc;
		regs->er5 = current->mm->start_data; /* GOT base */

		return;
		return 0;

		give_sigsegv:
		force_sigsegv(sig, current);
		return -EFAULT;
		}

		/*
		@@ -453,6 +455,7 @@ static void
		handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,
		sigset_t oldset, struct pt_regs regs)
		{
		int ret;
		/* are we from a system call? */
		if (regs->orig_er0 >= 0) {
		switch (regs->er0) {
		@@ -475,10 +478,11 @@ handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,

		/* set up the stack frame */
		if (ka->sa.sa_flags & SA_SIGINFO)
		setup_rt_frame(sig, ka, info, oldset, regs);
		ret = setup_rt_frame(sig, ka, info, oldset, regs);
		else
		setup_frame(sig, ka, oldset, regs);
		ret = setup_frame(sig, ka, oldset, regs);

		if (!ret)
		block_sigmask(ka, sig);
		}