diff options
author | Colin Watson <cjwatson@debian.org> | 2019-06-05 06:41:44 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2019-06-09 22:09:07 +0100 |
commit | 865a97e05b6aab1619e1c8eeb33ccb8f9a9e48d3 (patch) | |
tree | 7bb2128eb663180bacfabca88f26d26bf0733824 /debian/patches/scp-disallow-dot-or-empty-filename.patch | |
parent | ba627ba172d6649919baedff5ba2789610da382a (diff) | |
parent | 7d50f9e5be88179325983a1f58c9d51bb58f025a (diff) |
New upstream release (8.0p1)
Diffstat (limited to 'debian/patches/scp-disallow-dot-or-empty-filename.patch')
-rw-r--r-- | debian/patches/scp-disallow-dot-or-empty-filename.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/debian/patches/scp-disallow-dot-or-empty-filename.patch b/debian/patches/scp-disallow-dot-or-empty-filename.patch deleted file mode 100644 index 716f2ffa8..000000000 --- a/debian/patches/scp-disallow-dot-or-empty-filename.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From dee21e97428e69d30e2d15c71f3e7cc08bf8e4f8 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: upstream: disallow empty incoming filename or ones that refer to the | ||
5 | |||
6 | current directory; based on report/patch from Harry Sintonen | ||
7 | |||
8 | OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 | ||
9 | |||
10 | Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=6010c0303a422a9c5fa8860c061bf7105eb7f8b2 | ||
11 | Bug-Debian: https://bugs.debian.org/919101 | ||
12 | Last-Update: 2019-01-12 | ||
13 | |||
14 | Patch-Name: scp-disallow-dot-or-empty-filename.patch | ||
15 | --- | ||
16 | scp.c | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/scp.c b/scp.c | ||
20 | index ed2864250..7163d33dc 100644 | ||
21 | --- a/scp.c | ||
22 | +++ b/scp.c | ||
23 | @@ -1114,7 +1114,8 @@ sink(int argc, char **argv) | ||
24 | SCREWUP("size out of range"); | ||
25 | size = (off_t)ull; | ||
26 | |||
27 | - if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { | ||
28 | + if (*cp == '\0' || strchr(cp, '/') != NULL || | ||
29 | + strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { | ||
30 | run_err("error: unexpected filename: %s", cp); | ||
31 | exit(1); | ||
32 | } | ||