summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/perl/perl/CVE-2017-12883.patch44
-rw-r--r--meta/recipes-devtools/perl/perl_5.24.1.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch b/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch
new file mode 100644
index 0000000000..5c1805f9e7
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch
@@ -0,0 +1,44 @@
1From 40b3cdad3649334585cee8f4630ec9a025e62be6 Mon Sep 17 00:00:00 2001
2From: Karl Williamson <khw@cpan.org>
3Date: Fri, 25 Aug 2017 11:33:58 -0600
4Subject: [PATCH] PATCH: [perl #131598]
5
6The cause of this is that the vFAIL macro uses RExC_parse, and that
7variable has just been changed in preparation for code after the vFAIL.
8The solution is to not change RExC_parse until after the vFAIL.
9
10This is a case where the macro hides stuff that can bite you.
11
12(cherry picked from commit 2be4edede4ae226e2eebd4eff28cedd2041f300f)
13
14Upstream-Status: Backport
15CVE: CVE-2017-12833
16Signed-off-by: Armin Kuster <akuster@mvista.com>
17
18---
19 regcomp.c | 6 ++++--
20 1 file changed, 4 insertions(+), 2 deletions(-)
21
22Index: perl-5.24.1/regcomp.c
23===================================================================
24--- perl-5.24.1.orig/regcomp.c
25+++ perl-5.24.1/regcomp.c
26@@ -11918,14 +11918,16 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx
27 }
28 sv_catpv(substitute_parse, ")");
29
30- RExC_parse = RExC_start = RExC_adjusted_start = SvPV(substitute_parse,
31- len);
32+ len = SvCUR(substitute_parse);
33
34 /* Don't allow empty number */
35 if (len < (STRLEN) 8) {
36 RExC_parse = endbrace;
37 vFAIL("Invalid hexadecimal number in \\N{U+...}");
38 }
39+
40+ RExC_parse = RExC_start = RExC_adjusted_start
41+ = SvPV_nolen(substitute_parse);
42 RExC_end = RExC_parse + len;
43
44 /* The values are Unicode, and therefore not subject to recoding, but
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index 222dd88675..53a426289a 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -64,6 +64,7 @@ SRC_URI += " \
64 file://perl-fix-conflict-between-skip_all-and-END.patch \ 64 file://perl-fix-conflict-between-skip_all-and-END.patch \
65 file://perl-test-customized.patch \ 65 file://perl-test-customized.patch \
66 file://perl-5.26.1-guard_old_libcrypt_fix.patch \ 66 file://perl-5.26.1-guard_old_libcrypt_fix.patch \
67 file://CVE-2017-12883.patch \
67" 68"
68 69
69# Fix test case issues 70# Fix test case issues