From 2b65a9e6d18c661f5bb6b3e557973c52b3294e87 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 15 Jan 2019 08:52:52 -0500 Subject: gnu: OpenSSH: Fix CVE-2018-20685. * gnu/packages/patches/openssh-CVE-2018-20685.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (openssh)[source]: Use it. --- gnu/packages/patches/openssh-CVE-2018-20685.patch | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 gnu/packages/patches/openssh-CVE-2018-20685.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/openssh-CVE-2018-20685.patch b/gnu/packages/patches/openssh-CVE-2018-20685.patch new file mode 100644 index 0000000000..463c08a9d4 --- /dev/null +++ b/gnu/packages/patches/openssh-CVE-2018-20685.patch @@ -0,0 +1,44 @@ +Fix CVE-2018-20685: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20685 + +Patch copied from upstream source repository: + +https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2 + +From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" +Date: Fri, 16 Nov 2018 03:03:10 +0000 +Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer + to the + +current directory; based on report/patch from Harry Sintonen + +OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 +--- + scp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scp.c b/scp.c +index 60682c68..4f3fdcd3 100644 +--- a/scp.c ++++ b/scp.c +#@@ -1,4 +1,4 @@ +#-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ +#+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ +# /* +# * scp - secure remote copy. This is basically patched BSD rcp which +# * uses ssh to do the data transfer (instead of using rcmd). +@@ -1106,7 +1106,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); + } +-- +2.20.1 + -- cgit v1.2.3 ef443f167edcceee'>root/gnu/packages/emacs-xyz.scm
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2022-03-09 13:26:12 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2022-03-09 14:16:59 +0100
commit1d7b1128ca40cdc60c832009ef443f167edcceee (patch)
tree514522931a9e0c4235a7bcd48b00ec7c1680b36a /gnu/packages/emacs-xyz.scm
parentca588fdfde849994cc7d399dc9d860ad06332a3e (diff)
downloadguix-1d7b1128ca40cdc60c832009ef443f167edcceee.tar.gz
guix-1d7b1128ca40cdc60c832009ef443f167edcceee.zip
gnu: emacs-corfu: Update to 0.20.
* gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 0.20.
Diffstat (limited to 'gnu/packages/emacs-xyz.scm')
-rw-r--r--gnu/packages/emacs-xyz.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b5078a4d82..0e5551873e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm