Merge ~halves/ubuntu/+source/sudo:lp1895757 into ubuntu/+source/sudo:ubuntu/bionic-devel

[Heitor Alves de Siqueira]

Unmerged commits

802f9d8... by Heitor Alves de Siqueira on 2020-09-23

Update d/changelog

dd72a5a... by Heitor Alves de Siqueira on 2020-09-23

LP: #1895757

diff --git a/debian/changelog b/debian/changelog
index 23f3972..6055a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sudo (1.8.21p2-3ubuntu1.3) bionic; urgency=medium
+
+  * d/p/0001-In-pty_close-close-the-slave-and-remove-any-events-a.patch:
+    - fix sudo hangs when IO logging is enabled (LP: #1895757)
+
+ -- Heitor Alves de Siqueira <[e-mail]>  Wed, 23 Sep 2020 14:59:35 +0000
+
 sudo (1.8.21p2-3ubuntu1.2) bionic-security; urgency=medium
 
   * SECURITY UPDATE: buffer overflow in sudo when pwfeedback is enabled
diff --git a/debian/patches/0001-In-pty_close-close-the-slave-and-remove-any-events-a.patch b/debian/patches/0001-In-pty_close-close-the-slave-and-remove-any-events-a.patch
 new file mode 100644
index 0000000..3a884be
--- /dev/null
+++ b/debian/patches/0001-In-pty_close-close-the-slave-and-remove-any-events-a.patch
@@ -0,0 +1,78 @@
+From c4523c6c798464e6a4bdf03d715d04d90c8114d5 Mon Sep 17 00:00:00 2001
+From: Heitor Alves de Siqueira <[e-mail]>
+Date: Wed, 23 Sep 2020 11:23:43 -0300
+Subject: [PATCH] In pty_close() close the slave and remove any events associated
+
+with it.  Fixes a potential hang when performing the final flush
+on non-BSD systems.
+
+Origin: backport, https://github.com/sudo-project/sudo/commit/4df454310dae
+Bug-ubuntu: https://bugs.launchpad.net/bugs/1895757
+---
+ src/exec_pty.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+Index: sudo/src/exec_pty.c
+===================================================================
+--- sudo.orig/src/exec_pty.c
++++ sudo/src/exec_pty.c
+@@ -680,12 +680,19 @@ io_buf_new(int rfd, int wfd,
+ }
+ 
+ static void
+-pty_close(struct command_status *cstat)
++pty_close(struct sudo_event_base *evbase, struct command_status *cstat)
+ {
+     struct io_buffer *iob;
+     int n;
+     debug_decl(pty_close, SUDO_DEBUG_EXEC);
+ 
++    /* Close the pty slave first so reads from the master don't block. */
++    if (io_fds[SFD_SLAVE] != -1) {
++	ev_free_by_fd(evbase, io_fds[SFD_SLAVE]);
++	close(io_fds[SFD_SLAVE]);
++	io_fds[SFD_SLAVE] = -1;
++    }
++
+     /* Flush any remaining output (the plugin already got it). */
+     if (io_fds[SFD_USERTTY] != -1) {
+ 	n = fcntl(io_fds[SFD_USERTTY], F_GETFL, 0);
+@@ -713,6 +720,11 @@ pty_close(struct command_status *cstat)
+     /* Update utmp */
+     if (utmp_user != NULL)
+ 	utmp_logout(slavename, cstat->type == CMD_WSTATUS ? cstat->val : 0);
++
++    /* Close pty master. */
++    if (io_fds[SFD_MASTER] != -1)
++	close(io_fds[SFD_MASTER]);
++
+     debug_return;
+ }
+ 
+@@ -1409,7 +1421,7 @@ exec_pty(struct command_details *details
+     }
+ 
+     /* Flush any remaining output, free I/O bufs and events, do logout. */
+-    pty_close(cstat);
++    pty_close(ec.evbase, cstat);
+ 
+     /* Free things up. */
+     free_exec_closure_pty(&ec);
+@@ -1509,6 +1521,8 @@ del_io_events(bool nonblocking)
+ 	    }
+ 	}
+     }
++    sudo_debug_printf(SUDO_DEBUG_INFO,
++	"%s: flushing remaining I/O buffers (nonblocking)", __func__);
+     (void) sudo_ev_loop(evbase, SUDO_EVLOOP_NONBLOCK);
+ 
+     /*
+@@ -1534,6 +1548,8 @@ del_io_events(bool nonblocking)
+ 		}
+ 	    }
+ 	}
++	sudo_debug_printf(SUDO_DEBUG_INFO,
++	    "%s: flushing remaining write buffers (blocking)", __func__);
+ 	(void) sudo_ev_loop(evbase, 0);
+      
+ 	/* We should now have flushed all write buffers. */
diff --git a/debian/patches/series b/debian/patches/series
index dfbedfc..64115a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ keep_home_by_default.patch
 CVE-2019-14287.patch
 CVE-2019-14287-2.patch
 CVE-2019-18634.patch
+0001-In-pty_close-close-the-slave-and-remove-any-events-a.patch