From 2bd9a198952800b81d47fa63db941aacdf1867cf Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 23 Jun 2014 02:11:31 +0000 Subject: signal.c: drop dangerous tag * signal.c (check_stack_overflow): drop the last tag too close to the fault page, to get rid of stack overflow deadlock. [Bug #9971] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'signal.c') diff --git a/signal.c b/signal.c index 1833639352..f49bd2aabf 100644 --- a/signal.c +++ b/signal.c @@ -738,6 +738,12 @@ check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx) * the fault page can be the next. */ if (sp_page == fault_page || sp_page == fault_page + 1) { rb_thread_t *th = ruby_current_thread; + if ((uintptr_t)th->tag->buf / pagesize == sp_page) { + /* drop the last tag if it is close to the fault, + * otherwise it can cause stack overflow again at the same + * place. */ + th->tag = th->tag->prev; + } ruby_thread_stack_overflow(th); } } -- cgit v1.2.3