From a485b7f4e0037c3358190bf29857218312b7dbf2ee5591a6d20613b36bbfbb9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 11 Jan 2019 17:55:43 +0000
Subject: [PATCH] Accepting request 664725 from
 home:pmonrealgonzalez:branches:network

- Security fix: [bsc#1121571, CVE-2018-20685]
  * The scp client allows remote SSH servers to bypass intended
    access restrictions
  * Added patch openssh-7.9p1-CVE-2018-20685.patch

OBS-URL: https://build.opensuse.org/request/show/664725
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=169
---
 openssh-7.9p1-CVE-2018-20685.patch | 33 ++++++++++++++++++++++++++++++
 openssh.changes                    |  8 ++++++++
 openssh.spec                       |  1 +
 3 files changed, 42 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..ac539dc
--- /dev/null
+++ b/openssh-7.9p1-CVE-2018-20685.patch
@@ -0,0 +1,33 @@
+From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <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
+@@ -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);
+ 		}
diff --git a/openssh.changes b/openssh.changes
index 1a108cc..6e3e41f 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 11 15:09:04 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
+
+- Security fix: [bsc#1121571, CVE-2018-20685]
+  * The scp client allows remote SSH servers to bypass intended
+    access restrictions
+  * Added patch openssh-7.9p1-CVE-2018-20685.patch
+
 -------------------------------------------------------------------
 Thu Jan  3 11:44:45 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/openssh.spec b/openssh.spec
index edb5e59..4e4fd5d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -99,6 +99,7 @@ Patch31:        openssh-7.7p1-ldap.patch
 Patch32:        openssh-7.7p1-IPv6_X_forwarding.patch
 Patch33:        openssh-7.7p1-sftp_print_diagnostic_messages.patch
 Patch34:        openssh-openssl-1_0_0-compatibility.patch
+Patch35:        openssh-7.9p1-CVE-2018-20685.patch
 BuildRequires:  audit-devel
 BuildRequires:  autoconf
 BuildRequires:  groff