Date: Wed, 16 Jan 2019 15:19:10 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r343098 - stable/10/crypto/openssh Message-ID: <201901161519.x0GFJAtg018834@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Jan 16 15:19:09 2019 New Revision: 343098 URL: https://svnweb.freebsd.org/changeset/base/343098 Log: MFC r343043: scp: disallow empty or current directory Obtained from: OpenBSD scp.c 1.198 Security: CVE-2018-20685 Sponsored by: The FreeBSD Foundation Modified: stable/10/crypto/openssh/scp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/crypto/openssh/scp.c ============================================================================== --- stable/10/crypto/openssh/scp.c Wed Jan 16 15:15:04 2019 (r343097) +++ stable/10/crypto/openssh/scp.c Wed Jan 16 15:19:09 2019 (r343098) @@ -1048,7 +1048,8 @@ sink(int argc, char **argv) size = size * 10 + (*cp++ - '0'); if (*cp++ != ' ') SCREWUP("size not delimited"); - 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901161519.x0GFJAtg018834>