From: Willy Tarreau <w@1wt.eu>
Date: Wed, 24 Feb 2021 10:08:56 +0000 (+0100)
Subject: BUG/MEDIUM: proxy: use thread-safe stream killing on hard-stop
X-Git-Tag: v2.4-dev10~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92b887e20a995323d3fbd42d2be035733cefd6ba;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: proxy: use thread-safe stream killing on hard-stop

When setting hard-stop-after, hard_stop() is called at the end to kill
last pending streams. Unfortunately there's no locking there while
walking over the streams list nor when shutting them down, so it's
very likely that some old processes have been crashing or gone wild
due to this. Let's use a thread_isolate() call for this as we don't
have much other choice (and it happens once in the process' life,
that's OK).

This must be backported to 1.8.
---

diff --git a/src/proxy.c b/src/proxy.c
index 96fc1765fe..3e3d7cc23e 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1633,9 +1633,12 @@ struct task *hard_stop(struct task *t, void *context, unsigned short state)
 		}
 		p = p->next;
 	}
+
+	thread_isolate();
 	list_for_each_entry(s, &streams, list) {
 		stream_shutdown(s, SF_ERR_KILLED);
 	}
+	thread_release();
 
 	killed = 1;
 	t->expire = tick_add(now_ms, MS_TO_TICKS(1000));