diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-27 20:22:33 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-27 20:22:33 +0000 |
| commit | 4c44387cdae423c79339dafa044980fd77ec422a (patch) | |
| tree | acf8cb1a89b828249823bab65b44c1519541d857 /system/openssh | |
| parent | 35cf1156baad094ddcf9ef26ad26e71fe5df1a97 (diff) | |
| download | packages-4c44387cdae423c79339dafa044980fd77ec422a.tar.gz packages-4c44387cdae423c79339dafa044980fd77ec422a.tar.bz2 packages-4c44387cdae423c79339dafa044980fd77ec422a.tar.xz packages-4c44387cdae423c79339dafa044980fd77ec422a.zip | |
system/openssh: CVE-2018-20685
Diffstat (limited to 'system/openssh')
| -rw-r--r-- | system/openssh/APKBUILD | 6 | ||||
| -rw-r--r-- | system/openssh/CVE-2018-20685.patch | 33 |
2 files changed, 38 insertions, 1 deletions
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 015e59192..145fc5c86 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=1 +pkgrel=2 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -26,6 +26,7 @@ subpackages="$pkgname-doc source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz bsd-compatible-realpath.patch + CVE-2018-20685.patch disable-forwarding-by-default.patch fix-utmpx.patch openssh7.4-peaktput.patch @@ -36,6 +37,8 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar sshd.confd " # secfixes: +# 7.9_p1-r2: +# - CVE-2018-20685 # 7.9_p1: # - CVE-2018-15473 # 7.7_p1: @@ -150,6 +153,7 @@ openrc() { sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch +b8907d3d6ebceeca15f6bc97551a7613c68df5c31e4e76d43b7c0bd9ad42dedcabc20a2cc5404b89f40850a4765b24892bde50eab1db55c96ad5cf23bb1f8d04 CVE-2018-20685.patch 8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de disable-forwarding-by-default.patch 0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch 398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch diff --git a/system/openssh/CVE-2018-20685.patch b/system/openssh/CVE-2018-20685.patch new file mode 100644 index 000000000..f2f1ecfc5 --- /dev/null +++ b/system/openssh/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); + } |