summaryrefslogtreecommitdiff
path: root/system/patch/CVE-2019-13638.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2019-07-22 11:29:38 -0400
committerMax Rees <maxcrees@me.com>2019-07-22 11:29:38 -0400
commit3f61500d4b0548ba68ab65add809e3fa3f5cbdf9 (patch)
tree325de9d017df47b7c9bc44a76fb86d03bfda0be2 /system/patch/CVE-2019-13638.patch
parentd3eb7058d8f66a7fa94c262314df4c95a76a36fc (diff)
downloadpackages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.tar.gz
packages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.tar.bz2
packages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.tar.xz
packages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.zip
system/patch: patch(!) for CVE-2018-6952, 2019-13636, 2019-13638
Diffstat (limited to 'system/patch/CVE-2019-13638.patch')
-rw-r--r--system/patch/CVE-2019-13638.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/system/patch/CVE-2019-13638.patch b/system/patch/CVE-2019-13638.patch
new file mode 100644
index 000000000..38caff628
--- /dev/null
+++ b/system/patch/CVE-2019-13638.patch
@@ -0,0 +1,38 @@
+From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@gnu.org>
+Date: Fri, 6 Apr 2018 19:36:15 +0200
+Subject: Invoke ed directly instead of using the shell
+
+* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell
+command to avoid quoting vulnerabilities.
+---
+ src/pch.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/pch.c b/src/pch.c
+index 4fd5a05..16e001a 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
+ *outname_needs_removal = true;
+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
+ }
+- sprintf (buf, "%s %s%s", editor_program,
+- verbosity == VERBOSE ? "" : "- ",
+- outname);
+ fflush (stdout);
+
+ pid = fork();
+@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
+ else if (pid == 0)
+ {
+ dup2 (tmpfd, 0);
+- execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
++ assert (outname[0] != '!' && outname[0] != '-');
++ execlp (editor_program, editor_program, "-", outname, (char *) NULL);
+ _exit (2);
+ }
+ else
+--
+cgit v1.0-41-gc330
+