From unknown Sun Aug 17 00:57:32 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#34084 <34084@debbugs.gnu.org> To: bug#34084 <34084@debbugs.gnu.org> Subject: Status: [PATCH] gnu: OpenSSH: Fix CVE-2018-20685. Reply-To: bug#34084 <34084@debbugs.gnu.org> Date: Sun, 17 Aug 2025 07:57:32 +0000 retitle 34084 [PATCH] gnu: OpenSSH: Fix CVE-2018-20685. reassign 34084 guix-patches submitter 34084 Leo Famulari severity 34084 normal tag 34084 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 15 09:19:26 2019 Received: (at submit) by debbugs.gnu.org; 15 Jan 2019 14:19:27 +0000 Received: from localhost ([127.0.0.1]:59632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjPYs-00042s-Eg for submit@debbugs.gnu.org; Tue, 15 Jan 2019 09:19:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjPYo-00042b-7r for submit@debbugs.gnu.org; Tue, 15 Jan 2019 09:19:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:56249) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjPYi-0004H9-5X for submit@debbugs.gnu.org; Tue, 15 Jan 2019 09:19:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjPYg-0002jb-S4 for guix-patches@gnu.org; Tue, 15 Jan 2019 09:19:15 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjPLh-0007TE-Qw for guix-patches@gnu.org; Tue, 15 Jan 2019 09:05:53 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46287) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjPLh-0007QP-KD for guix-patches@gnu.org; Tue, 15 Jan 2019 09:05:49 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B9E8C28D9A; Tue, 15 Jan 2019 09:05:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 15 Jan 2019 09:05:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=LPPoQOKw953S46QF/Srj2+Q obCmerHtDdpEuZm5jxb8=; b=LTS1RScsRsuRnNJm7WdZOwXVKS8L0B3oQrqFAcW PhQUn47j3y0ISGrBUc6Bv2gvgnw9++Kv6NfKe5/DTvhEGSeD9scFyypPAskz0yM9 hK+tPYfe2NDE8XKbtbpLwx0taQatLxuAP1J6kWlotDqeNO5t1WL7C7Mt54OYRLzP l9ls= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=LPPoQOKw953S46QF/ Srj2+QobCmerHtDdpEuZm5jxb8=; b=JVkYHmtNvacCNXsNnFjc0ktA14u8IjuFP gGgEdFTWgAT6YvyS1wf5Nt8HfLRFXey1gHcIRaDxieqjAZXlpvTyTewpAumOu27v G8hPUDc2QJ+W7E53NsQXv2q5D20MHdMx0mJw6ehPkbH2aR+wby71WuwfPO0Fw0En y0XPTto4PCMh4E5CCha5pLIU8rvhS2RNt1ZtTYRQgYeVQ9+2FQUpoQ+3QEYAyf8f HJDejthGg4hm9Z94ztqCLZ10HSF1epLErmkaY5CHLc1D/up4PlRaKkjxGzaRecW1 Bhh++tirVgMcSerI0Jok7sojwJ7Hwmd82bTwmiIuF2td7rLvRaf7Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrgeefgdehkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucenucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepnfgvoh cuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuffhomhgr ihhnpehmihhtrhgvrdhorhhgpdhgihhthhhusgdrtghomhenucfkphepudejvddrheekrd dvtddurddvtdeknecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghr ihdrnhgrmhgvnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from jasmine.lan (unknown [172.58.201.208]) by mail.messagingengine.com (Postfix) with ESMTPA id F0DF5E462B for ; Tue, 15 Jan 2019 09:05:45 -0500 (EST) From: Leo Famulari To: guix-patches@gnu.org Subject: [PATCH] gnu: OpenSSH: Fix CVE-2018-20685. Date: Tue, 15 Jan 2019 09:05:41 -0500 Message-Id: X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/patches/openssh-CVE-2018-20685.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (openssh)[source]: Use it. --- gnu/local.mk | 1 + .../patches/openssh-CVE-2018-20685.patch | 44 +++++++++++++++++++ gnu/packages/ssh.scm | 1 + 3 files changed, 46 insertions(+) create mode 100644 gnu/packages/patches/openssh-CVE-2018-20685.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7ee41de64..f3eff831a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1044,6 +1044,7 @@ dist_patch_DATA = \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ + %D%/packages/patches/openssh-CVE-2018-20685.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/patches/openssh-CVE-2018-20685.patch b/gnu/packages/patches/openssh-CVE-2018-20685.patch new file mode 100644 index 000000000..463c08a9d --- /dev/null +++ b/gnu/packages/patches/openssh-CVE-2018-20685.patch @@ -0,0 +1,44 @@ +Fix CVE-2018-20685: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20685 + +Patch copied from upstream source repository: + +https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2 + +From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" +Date: Fri, 16 Nov 2018 03:03:10 +0000 +Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer + to the + +current directory; based on report/patch from Harry Sintonen + +OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 +--- + scp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scp.c b/scp.c +index 60682c68..4f3fdcd3 100644 +--- a/scp.c ++++ b/scp.c +#@@ -1,4 +1,4 @@ +#-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ +#+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ +# /* +# * scp - secure remote copy. This is basically patched BSD rcp which +# * uses ssh to do the data transfer (instead of using rcmd). +@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) + SCREWUP("size out of range"); + size = (off_t)ull; + +- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { ++ if (*cp == '\0' || strchr(cp, '/') != NULL || ++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { + run_err("error: unexpected filename: %s", cp); + exit(1); + } +-- +2.20.1 + diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 88230c505..78659fbbf 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -149,6 +149,7 @@ a server that supports the SSH-2 protocol.") (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" name "-" version ".tar.gz")) + (patches (search-patches "openssh-CVE-2018-20685.patch")) (sha256 (base32 "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb")))) -- 2.20.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 16 05:48:49 2019 Received: (at 34084) by debbugs.gnu.org; 16 Jan 2019 10:48:49 +0000 Received: from localhost ([127.0.0.1]:60752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjika-0001og-Tj for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:48:49 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:46490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjikZ-0001oY-D5 for 34084@debbugs.gnu.org; Wed, 16 Jan 2019 05:48:48 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CBE7F1C4A; Wed, 16 Jan 2019 11:48:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KHajNJkOQiEw; Wed, 16 Jan 2019 11:48:45 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id E5A851C49; Wed, 16 Jan 2019 11:48:44 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Leo Famulari Subject: Re: [bug#34084] [PATCH] gnu: OpenSSH: Fix CVE-2018-20685. References: Date: Wed, 16 Jan 2019 11:48:44 +0100 In-Reply-To: (Leo Famulari's message of "Tue, 15 Jan 2019 09:05:41 -0500") Message-ID: <874la8x4hf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 34084 Cc: 34084@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Leo, Leo Famulari skribis: > * gnu/packages/patches/openssh-CVE-2018-20685.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/ssh.scm (openssh)[source]: Use it. LGTM, thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 17 14:24:04 2019 Received: (at 34084-done) by debbugs.gnu.org; 17 Jan 2019 19:24:05 +0000 Received: from localhost ([127.0.0.1]:35331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkDGm-00058a-Nk for submit@debbugs.gnu.org; Thu, 17 Jan 2019 14:24:04 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkDGh-000581-Jy for 34084-done@debbugs.gnu.org; Thu, 17 Jan 2019 14:24:01 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id C4D9A27A94; Thu, 17 Jan 2019 14:23:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 17 Jan 2019 14:23:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=1e3EkCnYymp0dRZZABr6ZI7Z ZGWCqjqxNqjW70k2z5Y=; b=Ef9Q04/o61ifjkKYNxgNcOlKn4rGz/5LAW2GLH2V 4OkUYh0Z1FgN84HQ+BD90E1syC7zcsKQvfFEdKAvoafb5TfQlWCg0AO3G1znz0tS hwbasgbY6ePhSRq9rAzRgXVNBpQLFXh/awQLKRJ9ufmIpjmjLr0r/UUscEwSUsTD kyk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=1e3EkC nYymp0dRZZABr6ZI7ZZGWCqjqxNqjW70k2z5Y=; b=D5Qjpv1eOpPh2bt9f52Nat 39Umx5Xvz1Br6dLhjxTZBnhe2+YG0VIqBdFmAqtoDwd3XfOlgby2j3Sbl9JtQ4mf NMy/y5647myoeGzneKAXuDq69zJK9RzvU3+darcSx80vuhEwtf6QzqKRknG2IyQ8 NUAuVVRDQk9aOe/73E2JdOWye5G+yOXn44s4U8yq5X5MTPC1wLw0GIkxeYrekOMl IxUpNtG7Hcqu8tOWVKnDnnTQBWVfV8ygV1kBJM+xrslgqgUirqdJt2U49B00EZs8 o1TuCQWmLLFcM3Qm5Li7avlCR6eVzI0R/oiul/DVC8RrTyuknaHsotqOj6btEk7Q == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrgeekgdduudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecumhhishhsihhnghcuvffquchfihgvlhguucdlfedtmdenucfjughrpeffhffukf hfgggtuggjfgesghdtreertderudenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceo lhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecukfhppeejuddruddthedrvddttddrje dvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv necuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (pool-71-105-200-72.nycmny.fios.verizon.net [71.105.200.72]) by mail.messagingengine.com (Postfix) with ESMTPA id E5669100E4 for <34084-done@debbugs.gnu.org>; Thu, 17 Jan 2019 14:23:52 -0500 (EST) Date: Thu, 17 Jan 2019 14:23:49 -0500 From: Leo Famulari Subject: Re: [bug#34084] [PATCH] gnu: OpenSSH: Fix CVE-2018-20685. Message-ID: <20190117192349.GA32231@jasmine.lan> References: <874la8x4hf.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="a8Wt8u1KmwUX3Y2C" Content-Disposition: inline In-Reply-To: <874la8x4hf.fsf@gnu.org> User-Agent: Mutt/1.11.0 (2018-11-25) X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 34084-done Cc: 34084-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --a8Wt8u1KmwUX3Y2C Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 16, 2019 at 11:48:44AM +0100, Ludovic Court=E8s wrote: > Hi Leo, >=20 > Leo Famulari skribis: >=20 > > * gnu/packages/patches/openssh-CVE-2018-20685.patch: New file. > > * gnu/local.mk (dist_patch_DATA): Add it. > > * gnu/packages/ssh.scm (openssh)[source]: Use it. >=20 > LGTM, thank you! Thanks, pushed as 2b65a9e6d18c661f5bb6b3e557973c52b3294e87 --a8Wt8u1KmwUX3Y2C Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlxA1kUACgkQJkb6MLrK fwgEQg/+J6eHxpqFYZupmyVnRPHeLlZ36sKyYt6xUxrAzNwOx4Pz4U7f/WiFQ3f/ 8Xf3DjpDIdNRR6fSZoIT0ctvMSywM3Bv0Ozw38/1il0dCrCUDBIrll/Bkm+Y6Df+ 13/zQ9CaLlbuMTMwnlYUxoMRwKcYpMYHs+o//3p+SuqS911rkMFUxBOc1VpeaKmf rpOT3e6GxuklvTA8dMzF28ghRZqm0hm+oCRUmhYPvaMtfNVVsTWqKs6npK0rNjLj P3AhIdlAfVGOXUI65TEh38jG29sCg9raxb8T6zMvtLfBM9/A2/3nV39rC0SwFhdV /Jm8omN5ba0GL1Rq/U6ZNzgc+TaSt3Pf+hRDsGZ6FP/vTnwRothOIe3KF3zh7d/I jc1g8VxRigP+jFsEG+OFRuu5lqw5twVXFBpsFfArwYZJjUaMpIXfHCOTTALFWpXw AvqBR19BJQdTY62+yziwYxxvDC4daJ6H3V574BLC9Hx2Y7cwaiLuLB6Kr3bPdWuO 9E91K7vCevlDp9UJ0IWZaR9gJjeMpvhmbUVZn+UQGS5ZoQC5PZa923LYDGOLcxBV G20oTACRYR1qrV9RB4aZHMDjRzyrbFUrXVaRfxLqlmQ9PRe6kZ5ITUpZy/KHnXL8 LCfMg2pYKHf3QsBNqc9Q62JNd9Gz3dLlVurMglZVLIdki+azUQc= =/Rty -----END PGP SIGNATURE----- --a8Wt8u1KmwUX3Y2C-- From unknown Sun Aug 17 00:57:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 15 Feb 2019 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator