Skip to content

Commit 4667d15

Browse files
committed
disallow empty incoming filename or ones that refer to the current
directory; based on report/patch from Harry Sintonen
1 parent c32ef45 commit 4667d15

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

usr.bin/ssh/scp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
1+
/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
22
/*
33
* scp - secure remote copy. This is basically patched BSD rcp which
44
* uses ssh to do the data transfer (instead of using rcmd).
@@ -1083,7 +1083,8 @@ sink(int argc, char **argv)
10831083
SCREWUP("size out of range");
10841084
size = (off_t)ull;
10851085

1086-
if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
1086+
if (*cp == '\0' || strchr(cp, '/') != NULL ||
1087+
strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
10871088
run_err("error: unexpected filename: %s", cp);
10881089
exit(1);
10891090
}

0 commit comments

Comments
 (0)