From 40d2a049096ae374004be12eeaf9dad1ca7841f0 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 14 Jan 2019 10:48:59 +0100 Subject: [PATCH] CVE-2018-20685 (#1665786) --- openssh-7.9p1-CVE-2018-20685.patch | 28 ++++++++++++++++++++++++++++ openssh.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 openssh-7.9p1-CVE-2018-20685.patch diff --git a/openssh-7.9p1-CVE-2018-20685.patch b/openssh-7.9p1-CVE-2018-20685.patch new file mode 100644 index 0000000..db7a4f8 --- /dev/null +++ b/openssh-7.9p1-CVE-2018-20685.patch @@ -0,0 +1,28 @@ +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 60682c687..4f3fdcd3d 100644 +--- a/scp.c ++++ b/scp.c +@@ -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); + } + diff --git a/openssh.spec b/openssh.spec index 4862b8b..7131fcb 100644 --- a/openssh.spec +++ b/openssh.spec @@ -231,6 +231,8 @@ Patch954: openssh-7.9p1-disable-sha1.patch Patch955: openssh-7.9p1-match-final.patch # Backport more after-release fixes (#1665611) Patch956: openssh-7.9p1-backports.patch +# Backport patch for CVE-2018-20685 (#1665786) +Patch957: openssh-7.9p1-CVE-2018-20685.patch License: BSD Group: Applications/Internet @@ -457,6 +459,7 @@ popd %patch954 -p1 -b .disable-sha1 %patch955 -p1 -b .match-final %patch956 -p1 -b .backports +%patch957 -p1 -b .CVE-2018-20685 %patch200 -p1 -b .audit %patch201 -p1 -b .audit-race