diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-08-22 20:10:40 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 07:50:01 +0100 |
commit | a11008a90dd0643b9ae6833905e5c2918d493f27 (patch) | |
tree | f11d9ce8b041756df16d0a61e271f6d878f5a7bb /meta/recipes-devtools/patch/patch | |
parent | 227a6c1acbd0e5f582d64dd683b044c9b35306dc (diff) | |
download | poky-a11008a90dd0643b9ae6833905e5c2918d493f27.tar.gz |
patch: fix CVE-2018-6952
(From OE-Core rev: 1314a6953aa647706107557faaba8574e307d2bd)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/patch/patch')
-rw-r--r-- | meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch | 36 |
1 files changed, 36 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 0000000000..049149eb9e --- /dev/null +++ b/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Gruenbacher <agruen@gnu.org> | ||
3 | Date: Fri, 17 Aug 2018 13:35:40 +0200 | ||
4 | Subject: [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 | ||
7 | blank line in the middle of a context-diff hunk: that empty line stays | ||
8 | in the middle of the hunk and isn't swapped. | ||
9 | |||
10 | Fixes: https://savannah.gnu.org/bugs/index.php?53133 | ||
11 | Signed-off-by: Andreas Gruenbacher <agruen@gnu.org> | ||
12 | |||
13 | Upstream-Status: Backport [https://git.savannah.gnu.org/git/patch.git] | ||
14 | CVE: CVE-2018-6952 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | |||
17 | --- | ||
18 | src/pch.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/src/pch.c b/src/pch.c | ||
22 | index 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 | -- | ||
35 | 2.10.2 | ||
36 | |||