upstream: disallow empty incoming filename or ones that refer to the

current directory; based on report/patch from Harry Sintonen

OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9

Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=6010c0303a422a9c5fa8860c061bf7105eb7f8b2
Bug-Debian: https://bugs.debian.org/919101
Last-Update: 2019-01-12

Patch-Name: scp-disallow-dot-or-empty-filename.patch

1 files changed, 2 insertions, 1 deletions

diff --git a/scp.c b/scp.c
index ed2864250..7163d33dc 100644
--- a/scp.c
+++ b/scp.c
@@ -1114,7 +1114,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);
                 }