summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl/perl/CVE-2018-6797.patch45
-rw-r--r--meta/recipes-devtools/perl/perl_5.24.1.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/CVE-2018-6797.patch b/meta/recipes-devtools/perl/perl/CVE-2018-6797.patch
new file mode 100644
index 0000000000..b56ebd3ea2
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/CVE-2018-6797.patch
@@ -0,0 +1,45 @@
1From abe1e6c568b96bcb382dfa4f61c56d1ab001ea51 Mon Sep 17 00:00:00 2001
2From: Karl Williamson <khw@cpan.org>
3Date: Fri, 2 Feb 2018 15:14:27 -0700
4Subject: [PATCH] (perl #132227) restart a node if we change to uni rules
5 within the node and encounter a sharp S
6
7This could lead to a buffer overflow.
8
9(cherry picked from commit a02c70e35d1313a5f4e245e8f863c810e991172d)
10
11CVE: CVE-2018-6797
12Upstream-Status: Backport [https://perl5.git.perl.org/perl.git/commitdiff/abe1e6c568b96bcb382dfa4f61c56d1ab001ea51]
13
14Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
15---
16 regcomp.c | 12 ++++++++++++
17 1 file changed, 12 insertions(+)
18
19diff --git a/regcomp.c b/regcomp.c
20index 3b9550b10d..a7dee9a09e 100644
21--- a/regcomp.c
22+++ b/regcomp.c
23@@ -13543,6 +13543,18 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
24 * /u. This includes the multi-char fold SHARP S to
25 * 'ss' */
26 if (UNLIKELY(ender == LATIN_SMALL_LETTER_SHARP_S)) {
27+
28+ /* If the node started out having uni rules, we
29+ * wouldn't have gotten here. So this means
30+ * something in the middle has changed it, but
31+ * didn't think it needed to reparse. But this
32+ * sharp s now does indicate the need for
33+ * reparsing. */
34+ if (RExC_uni_semantics) {
35+ p = oldp;
36+ goto loopdone;
37+ }
38+
39 RExC_seen_unfolded_sharp_s = 1;
40 maybe_exactfu = FALSE;
41 }
42--
432.15.1-424-g9478a660812
44
45
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index 311df4003e..882c1cf6ce 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -68,6 +68,7 @@ SRC_URI += " \
68 file://CVE-2017-12837.patch \ 68 file://CVE-2017-12837.patch \
69 file://CVE-2018-6798-1.patch \ 69 file://CVE-2018-6798-1.patch \
70 file://CVE-2018-6798-2.patch \ 70 file://CVE-2018-6798-2.patch \
71 file://CVE-2018-6797.patch \
71" 72"
72 73
73# Fix test case issues 74# Fix test case issues