summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-08-22 12:10:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 09:55:38 (GMT)
commit05711ba18587aaaf4a9c465a1dd4537f27ceda93 (patch)
tree67752443687a1390888f8cdd65188a2f1ec8cb1d
parent40a817a0384454a2f421d30a5f317cdb5e680220 (diff)
downloadpoky-05711ba18587aaaf4a9c465a1dd4537f27ceda93.tar.gz
patch: fix CVE-2018-6952
(From OE-Core rev: 1314a6953aa647706107557faaba8574e307d2bd) (From OE-Core rev: 7d518d342eb67d25aa071fb08d03f06d6da576c6) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch36
-rw-r--r--meta/recipes-devtools/patch/patch_2.7.6.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch b/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch
new file mode 100644
index 0000000..049149e
--- /dev/null
+++ b/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch
@@ -0,0 +1,36 @@
1From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001
2From: Andreas Gruenbacher <agruen@gnu.org>
3Date: Fri, 17 Aug 2018 13:35:40 +0200
4Subject: [PATCH] Fix swapping fake lines in pch_swap
5
6* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
7blank line in the middle of a context-diff hunk: that empty line stays
8in the middle of the hunk and isn't swapped.
9
10Fixes: https://savannah.gnu.org/bugs/index.php?53133
11Signed-off-by: Andreas Gruenbacher <agruen@gnu.org>
12
13Upstream-Status: Backport [https://git.savannah.gnu.org/git/patch.git]
14CVE: CVE-2018-6952
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16
17---
18 src/pch.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/src/pch.c b/src/pch.c
22index e92bc64..a500ad9 100644
23--- a/src/pch.c
24+++ b/src/pch.c
25@@ -2122,7 +2122,7 @@ pch_swap (void)
26 }
27 if (p_efake >= 0) { /* fix non-freeable ptr range */
28 if (p_efake <= i)
29- n = p_end - i + 1;
30+ n = p_end - p_ptrn_lines;
31 else
32 n = -i;
33 p_efake += n;
34--
352.10.2
36
diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb
index 823486d..85b0db7 100644
--- a/meta/recipes-devtools/patch/patch_2.7.6.bb
+++ b/meta/recipes-devtools/patch/patch_2.7.6.bb
@@ -5,6 +5,7 @@ SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
5 file://0002-Fix-segfault-with-mangled-rename-patch.patch \ 5 file://0002-Fix-segfault-with-mangled-rename-patch.patch \
6 file://0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch \ 6 file://0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch \
7 file://0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch \ 7 file://0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch \
8 file://0001-Fix-swapping-fake-lines-in-pch_swap.patch \
8" 9"
9 10
10SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" 11SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600"