Merge ~athos-ribeiro/ubuntu/+source/openssh:lp1903516-timeout-bionic into ubuntu/+source/openssh:ubuntu/bionic-devel

[Athos Ribeiro]

This is an SRU proposal for LP: #1903516 for bionic. Due to its size and relevance, the idea is to stage the SRU.

A PPA with the proposed changes is available at

https://launchpad.net/~athos-ribeiro/+archive/ubuntu/openssh-lp1903516-timeout/+packages

I ran the autopkgtest suite locally, here is the result summary:

autopkgtest [13:53:18]: @@@@@@@@@@@@@@@@@@@@ summary
regress PASS

[Sergio Durigan Junior (sergiodj)]

LGTM, thanks!

review: Approve

[Sergio Durigan Junior (sergiodj)]

I've merged this into my change to fix bug #1966591 and uploaded the package:

$ dput openssh_7.6p1-4ubuntu0.7_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/openssh/openssh_7.6p1-4ubuntu0.7_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/openssh/openssh_7.6p1-4ubuntu0.7.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openssh_7.6p1-4ubuntu0.7.dsc: done.
  Uploading openssh_7.6p1-4ubuntu0.7.debian.tar.xz: done.
  Uploading openssh_7.6p1-4ubuntu0.7_source.buildinfo: done.
  Uploading openssh_7.6p1-4ubuntu0.7_source.changes: done.
Successfully uploaded packages.

Unmerged commits

deea6cc... by Athos Ribeiro on 2022-03-30

Update changelog for 1:7.6p1-4ubuntu0.7 release

585aed6... by Athos Ribeiro on 2022-03-30

* d/p/fix-connect-timeout-overflow.patch: prevent ConnectTimeout overflow.
  (LP: #1903516)

diff --git a/debian/changelog b/debian/changelog
index d729727..f0c46ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.6p1-4ubuntu0.7) bionic; urgency=medium
+
+  * d/p/fix-connect-timeout-overflow.patch: prevent ConnectTimeout overflow.
+    (LP: #1903516)
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 30 Mar 2022 10:17:14 -0300
+
 openssh (1:7.6p1-4ubuntu0.6) bionic; urgency=medium
 
   * fix clients advertising version 1.99 (LP: #1863930)
diff --git a/debian/patches/fix-connect-timeout-overflow.patch b/debian/patches/fix-connect-timeout-overflow.patch
new file mode 100644
index 0000000..f4cb6a6
--- /dev/null
+++ b/debian/patches/fix-connect-timeout-overflow.patch
@@ -0,0 +1,32 @@
+From 819b44e8b9af6ce18d3ec7505b9f461bf7991a1f Mon Sep 17 00:00:00 2001
+From: "[e-mail]" <[e-mail]>
+Date: Thu, 12 Nov 2020 22:38:57 +0000
+Subject: [PATCH] upstream: Prevent integer overflow when ridiculously large
+
+ConnectTimeout is specified, capping the effective value (for most platforms)
+at 24 days. bz#3229, ok djm@
+
+OpenBSD-Commit-ID: 62d4c4b7b87d111045f8e9f28b5b532d17ac5bc0
+
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=3229
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1903516
+Origin: upstream, http://anongit.mindrot.org/openssh.git/commit/?id=819b44e8b9af6ce18d3ec7505b9f461bf7991a1f
+Last-Update: 2022-03-30
+---
+ ssh.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -1279,7 +1279,10 @@
+ 			cleanup_exit(255); /* resolve_host logs the error */
+ 	}
+ 
+-	timeout_ms = options.connection_timeout * 1000;
++	if (options.connection_timeout >= INT_MAX/1000)
++		timeout_ms = INT_MAX;
++	else
++		timeout_ms = options.connection_timeout * 1000;
+ 
+ 	/* Open a connection to the remote host. */
+ 	if (ssh_connect(ssh, host, addrs, &hostaddr, options.port,
diff --git a/debian/patches/series b/debian/patches/series
index 6f678bd..ed60d3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@ CVE-2019-6111-2.patch
 regress-2020.patch
 lp-1863930-unbreak-clients-that-advertise-protocol.patch
 lp-1863930-Fix-logic-bug-in-sshd_exchange_identification.patch
+fix-connect-timeout-overflow.patch