summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-05-30 10:35:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-31 15:36:20 +0100
commit0b755e02698f6360b76bdb7e8e05be025209fcf6 (patch)
tree10de75fb102671e342b1dd179dc417ff1299a498 /meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
parent6ba8e155b65d446bd4f5ee695501e5b431c478c2 (diff)
downloadpoky-0b755e02698f6360b76bdb7e8e05be025209fcf6.tar.gz
openssh: Upgrade 7.9p1 -> 8.0p1
Upgrade from openssh_7.9p1.bb to openssh_8.0p1.bb. -openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch -openssh/CVE-2018-20685.patch -openssh/CVE-2019-6109.patch -openssh/CVE-2019-6111.patch -Removed since these are included in 8.0p1. (From OE-Core rev: 7e21cfec4de3d66585c92632e1503df54a89b79a) Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
deleted file mode 100644
index c5b3baece9..0000000000
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Fri, 16 Nov 2018 03:03:10 +0000
4Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
5 to the
6
7current directory; based on report/patch from Harry Sintonen
8
9OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
10
11CVE: CVE-2018-20685
12Upstream-Status: Backport
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14---
15 scp.c | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-)
17
18diff --git a/scp.c b/scp.c
19index 60682c6..4f3fdcd 100644
20--- a/scp.c
21+++ b/scp.c
22@@ -1,4 +1,4 @@
23-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
24+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
25 /*
26 * scp - secure remote copy. This is basically patched BSD rcp which
27 * uses ssh to do the data transfer (instead of using rcmd).
28@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
29 SCREWUP("size out of range");
30 size = (off_t)ull;
31
32- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
33+ if (*cp == '\0' || strchr(cp, '/') != NULL ||
34+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
35 run_err("error: unexpected filename: %s", cp);
36 exit(1);
37 }
38--
392.7.4
40