Merge ~paelzer/ubuntu/+source/bind9:bug-1797926-race-on-shutdown-bionic into ubuntu/+source/bind9:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Continuation on https://code.launchpad.net/~paelzer/ubuntu/+source/bind9/+git/bind9/+merge/370942
which identified this extra fix for Xenial (other MP) and Bionic (this MP).

Part of the same PPA https://launchpad.net/~paelzer/+archive/ubuntu/bug-1833400-bind-crash

[Christian Ehrhardt  (paelzer)]

Added the SRU template for 1797926

[Christian Ehrhardt  (paelzer)]

Arr - forgot to set to "need's review".
Not it should be correctly visible ...

[Andreas Hasenack (ahasenack)]

The bug number in the 6f105789e5c4461652e4bc6b0e8ae0b59a0d7c56 commit message is wrong, but the contents of the commit are right.

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Fixed the commit message to avoid later confusion - thanks.

[Christian Ehrhardt  (paelzer)]

tagged and uploaded

[Christian Ehrhardt  (paelzer)]

This migrated, closing forgotten MP

diff --git a/debian/changelog b/debian/changelog
index 53a969f..868b5cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bind9 (1:9.11.3+dfsg-1ubuntu1.9) bionic; urgency=medium
+
+  * d/p/fix-shutdown-race.diff: dig/host/nslookup could crash when interrupted
+    close to a query timeout (LP: #1797926)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 07 Aug 2019 16:43:40 +0200
+
 bind9 (1:9.11.3+dfsg-1ubuntu1.8) bionic-security; urgency=medium
 
   * SECURITY UPDATE: DoS via malformed packets
diff --git a/debian/patches/fix-shutdown-race.diff b/debian/patches/fix-shutdown-race.diff
new file mode 100644
index 0000000..f10f51f
--- /dev/null
+++ b/debian/patches/fix-shutdown-race.diff
@@ -0,0 +1,41 @@
+From f2ca287330110993609fa0443d3bdb17629bd979 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <[e-mail]>
+Date: Tue, 13 Nov 2018 13:50:47 +0100
+Subject: [PATCH 1/2] Fix a shutdown race in bin/dig/dighost.c
+
+If a tool using the routines defined in bin/dig/dighost.c is sent an
+interruption signal around the time a connection timeout is scheduled to
+fire, connect_timeout() may be executed after destroy_libs() detaches
+from the global task (setting 'global_task' to NULL), which results in a
+crash upon a UDP retry due to bringup_timer() attempting to create a
+timer with 'task' set to NULL.  Fix by preventing connect_timeout() from
+attempting a retry when shutdown is in progress.
+
+(cherry picked from commit 462175659674a10c0d39c7c328f1a5324ce2e38b)
+
+Origin: https://gitlab.isc.org/isc-projects/bind9/merge_requests/1040/diffs
+Bug: https://gitlab.isc.org/isc-projects/bind9/issues/599
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bind9/+bug/1797926
+Last-Update: 2018-12-06
+
+---
+ bin/dig/dighost.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
+index 39abb9d0fd..17e0328228 100644
+--- a/bin/dig/dighost.c
++++ b/bin/dig/dighost.c
+@@ -3240,6 +3240,11 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
+ 
+ 	INSIST(!free_now);
+ 
++	if (cancel_now) {
++		UNLOCK_LOOKUP;
++		return;
++	}
++
+ 	if ((query != NULL) && (query->lookup->current_query != NULL) &&
+ 	    ISC_LINK_LINKED(query->lookup->current_query, link) &&
+ 	    (ISC_LIST_NEXT(query->lookup->current_query, link) != NULL)) {
+-- 
+2.18.1
diff --git a/debian/patches/series b/debian/patches/series
index 3230d61..bbf12e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ CVE-2019-6465.patch
 CVE-2018-5743.patch
 CVE-2018-5743-atomic-fix.patch
 CVE-2019-6471.patch
+fix-shutdown-race.diff