diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 01:26:58 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 01:26:58 +0000 |
| commit | 4722d4b7980d6fd8145e2e9f08492d951ea261d1 (patch) | |
| tree | 7ab498b39f5bdce46b1bbc41ef5201322df4e2d4 /debian/patches/scp-disallow-dot-or-empty-filename.patch | |
| parent | Adding upstream version 1:7.9p1. (diff) | |
| download | openssh-4722d4b7980d6fd8145e2e9f08492d951ea261d1.tar.xz openssh-4722d4b7980d6fd8145e2e9f08492d951ea261d1.zip | |
Adding debian version 1:7.9p1-10+deb10u2.debian/1%7.9p1-10+deb10u2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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, 32 insertions, 0 deletions
diff --git a/debian/patches/scp-disallow-dot-or-empty-filename.patch b/debian/patches/scp-disallow-dot-or-empty-filename.patch new file mode 100644 index 0000000..716f2ff --- /dev/null +++ b/debian/patches/scp-disallow-dot-or-empty-filename.patch @@ -0,0 +1,32 @@ +From dee21e97428e69d30e2d15c71f3e7cc08bf8e4f8 Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Fri, 16 Nov 2018 03:03:10 +0000 +Subject: 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 +--- + scp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +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); + } |