Blame openssh-7.9p1-CVE-2018-20685.patch
|
Jakub Jelen |
40d2a0 |
From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
|
|
Jakub Jelen |
40d2a0 |
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Jakub Jelen |
40d2a0 |
Date: Fri, 16 Nov 2018 03:03:10 +0000
|
|
Jakub Jelen |
40d2a0 |
Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
|
|
Jakub Jelen |
40d2a0 |
to the
|
|
Jakub Jelen |
40d2a0 |
|
|
Jakub Jelen |
40d2a0 |
current directory; based on report/patch from Harry Sintonen
|
|
Jakub Jelen |
40d2a0 |
|
|
Jakub Jelen |
40d2a0 |
OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
|
|
Jakub Jelen |
40d2a0 |
---
|
|
Jakub Jelen |
40d2a0 |
scp.c | 5 +++--
|
|
Jakub Jelen |
40d2a0 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
Jakub Jelen |
40d2a0 |
|
|
Jakub Jelen |
40d2a0 |
diff --git a/scp.c b/scp.c
|
|
Jakub Jelen |
40d2a0 |
index 60682c687..4f3fdcd3d 100644
|
|
Jakub Jelen |
40d2a0 |
--- a/scp.c
|
|
Jakub Jelen |
40d2a0 |
+++ b/scp.c
|
|
Jakub Jelen |
40d2a0 |
@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
|
|
Jakub Jelen |
40d2a0 |
SCREWUP("size out of range");
|
|
Jakub Jelen |
40d2a0 |
size = (off_t)ull;
|
|
Jakub Jelen |
40d2a0 |
|
|
Jakub Jelen |
40d2a0 |
- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
|
|
Jakub Jelen |
40d2a0 |
+ if (*cp == '\0' || strchr(cp, '/') != NULL ||
|
|
Jakub Jelen |
40d2a0 |
+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
|
|
Jakub Jelen |
40d2a0 |
run_err("error: unexpected filename: %s", cp);
|
|
Jakub Jelen |
40d2a0 |
exit(1);
|
|
Jakub Jelen |
40d2a0 |
}
|
|
Jakub Jelen |
40d2a0 |
|