| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 |
| 2 | From: "djm@openbsd.org" <djm@openbsd.org> |
| 3 | Date: Fri, 16 Nov 2018 03:03:10 +0000 |
| 4 | Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer |
| 5 | to the |
| 6 | |
| 7 | current directory; based on report/patch from Harry Sintonen |
| 8 | |
| 9 | OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 |
| 10 | |
| 11 | CVE: CVE-2018-20685 |
| 12 | Upstream-Status: Backport |
| 13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 14 | --- |
| 15 | scp.c | 5 +++-- |
| 16 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/scp.c b/scp.c |
| 19 | index 60682c6..4f3fdcd 100644 |
| 20 | --- a/scp.c |
| 21 | +++ b/scp.c |
| 22 | @@ -1,4 +1,4 @@ |
| 23 | -/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ |
| 24 | +/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ |
| 25 | /* |
| 26 | * scp - secure remote copy. This is basically patched BSD rcp which |
| 27 | * uses ssh to do the data transfer (instead of using rcmd). |
| 28 | @@ -1106,7 +1106,8 @@ sink(int argc, char **argv) |
| 29 | SCREWUP("size out of range"); |
| 30 | size = (off_t)ull; |
| 31 | |
| 32 | - if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { |
| 33 | + if (*cp == '\0' || strchr(cp, '/') != NULL || |
| 34 | + strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { |
| 35 | run_err("error: unexpected filename: %s", cp); |
| 36 | exit(1); |
| 37 | } |
| 38 | -- |
| 39 | 2.7.4 |
| 40 | |