aboutsummaryrefslogtreecommitdiffstats
path: root/tools/patch/patches/010-CVE-2018-6951.patch
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2018-10-15 10:17:29 -0700
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-10-16 11:51:10 +0100
commita6bd9d0cb652686453604b762e80a35d023908c4 (patch)
treee848a2190deac7e246fe21dd8ba02c5a6a3f5600 /tools/patch/patches/010-CVE-2018-6951.patch
parent3e633bb3709611d79965fab667e3239fd3bde151 (diff)
downloadupstream-a6bd9d0cb652686453604b762e80a35d023908c4.tar.gz
upstream-a6bd9d0cb652686453604b762e80a35d023908c4.tar.bz2
upstream-a6bd9d0cb652686453604b762e80a35d023908c4.zip
tools: patch: Add missing CVE-2018-6951 fix
uscan reports a new CVE now that PKG_CPE_ID was added. Reordered patches by date. Signed-off-by: Rosen Penev <rosenp@gmail.com> [re-title commit & refresh patches] Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'tools/patch/patches/010-CVE-2018-6951.patch')
-rw-r--r--tools/patch/patches/010-CVE-2018-6951.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/tools/patch/patches/010-CVE-2018-6951.patch b/tools/patch/patches/010-CVE-2018-6951.patch
new file mode 100644
index 0000000000..10dc568099
--- /dev/null
+++ b/tools/patch/patches/010-CVE-2018-6951.patch
@@ -0,0 +1,24 @@
+From 1f7853c05f9949d81da9be7a02b90cc64284d1f8 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@gnu.org>
+Date: Mon, 12 Feb 2018 16:48:24 +0100
+Subject: [PATCH] Fix segfault with mangled rename patch
+
+http://savannah.gnu.org/bugs/?53132
+* src/pch.c (intuit_diff_type): Ensure that two filenames are specified
+for renames and copies (fix the existing check).
+---
+ src/pch.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode
+ if ((pch_rename () || pch_copy ())
+ && ! inname
+ && ! ((i == OLD || i == NEW) &&
+- p_name[! reverse] &&
++ p_name[reverse] && p_name[! reverse] &&
++ name_is_valid (p_name[reverse]) &&
+ name_is_valid (p_name[! reverse])))
+ {
+ say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");