git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>,
	Brady Catherman <brady@catherman.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] http-backend: Don't infinite loop during die()
Date: Mon, 22 Mar 2010 07:22:04 -0700	[thread overview]
Message-ID: <20100322142204.GB8916@spearce.org> (raw)
In-Reply-To: <51569EE6-A926-45DB-A588-B659750BA643@catherman.org>

If stdout has already been closed by the CGI and die() gets called,
the CGI will fail to write the "Status: 500 Internal Server Error" to
the pipe, which results in die() being called again (via safe_write).
This goes on in an infinite loop until the stack overflows and the
process is killed by SIGSEGV.

Instead set a flag on the first die() invocation and perform no
action during recursive die() calls.  This way failures to write the
error messages to the stdout pipe do not result in an infinite loop.

We also now report on the death to stderr before we report to stdout,
to increase the chances that the cause of the die() invocation will
appear in the server's error log.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

 This patch should be put in maint.

 It doesn't fix the underlying problem Brady has found, but it
 will at least get us more information by avoiding the infinite
 loop and later SIGSEGV crash of the parent CGI.

 http-backend.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/http-backend.c b/http-backend.c
index 8c7b7d0..5c0d649 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -538,12 +538,17 @@ static void service_rpc(char *service_name)
 
 static NORETURN void die_webcgi(const char *err, va_list params)
 {
-	http_status(500, "Internal Server Error");
-	hdr_nocache();
-	end_headers();
+	static int dead;
 
-	vreportf("fatal: ", err, params);
-	exit(0);
+	if (!dead) {
+		dead = 1;
+
+		vreportf("fatal: ", err, params);
+		http_status(500, "Internal Server Error");
+		hdr_nocache();
+		end_headers();
+		exit(0);
+	}
 }
 
 static char* getdir(void)
-- 
1.6.4.rc2.182.g24de1

-- 
Shawn.

  parent reply	other threads:[~2010-03-22 14:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-22  6:52 git clone over smart-http hanging for just one repo Brady Catherman
2010-03-22 14:12 ` Shawn O. Pearce
2010-03-22 14:22 ` Shawn O. Pearce [this message]
2010-03-22 20:25   ` [PATCH] http-backend: Don't infinite loop during die() Junio C Hamano
2010-03-24 18:29   ` Junio C Hamano
2010-03-24 20:06     ` Shawn O. Pearce
2010-03-24 20:24       ` Nicolas Pitre
2010-03-24 20:25         ` Shawn Pearce
2010-03-24 21:37       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100322142204.GB8916@spearce.org \
    --to=spearce@spearce.org \
    --cc=brady@catherman.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).