summaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2010-09-20 15:13:14 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 10:44:37 -0700
commitad0acab4557a91a60251b3ffe3478fad572d6f61 (patch)
tree15800a89d6a04a0f0d72df2056f779a8755a5f97 /arch/frv
parent5f4ad04a1e805d14de080ff9d5384b4d20518a9a (diff)
downloadlinux-ad0acab4557a91a60251b3ffe3478fad572d6f61.tar.gz
linux-ad0acab4557a91a60251b3ffe3478fad572d6f61.tar.bz2
linux-ad0acab4557a91a60251b3ffe3478fad572d6f61.zip
frv: avoid infinite loop of SIGSEGV delivery
Use force_sigsegv() rather than force_sig(SIGSEGV, ...) as the former resets the SEGV handler pointer which will kill the process, rather than leaving it open to an infinite loop if the SEGV handler itself caused a SEGV signal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/signal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 5fb2d0661c78..48203c68e39f 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -329,7 +329,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
return 0;
give_sigsegv:
- force_sig(SIGSEGV, current);
+ force_sigsegv(sig, current);
return -EFAULT;
} /* end setup_frame() */
@@ -431,7 +431,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
return 0;
give_sigsegv:
- force_sig(SIGSEGV, current);
+ force_sigsegv(sig, current);
return -EFAULT;
} /* end setup_rt_frame() */