svn commit: r343096 - stable/12/crypto/openssh

[Ed Maste]

Author: emaste
Date: Wed Jan 16 15:12:19 2019
New Revision: 343096
URL: https://svnweb.freebsd.org/changeset/base/343096

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/12/crypto/openssh/scp.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/crypto/openssh/scp.c
==============================================================================
--- stable/12/crypto/openssh/scp.c	Wed Jan 16 14:42:33 2019	(r343095)
+++ stable/12/crypto/openssh/scp.c	Wed Jan 16 15:12:19 2019	(r343096)
@@ -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);
 		}