summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/perl/perl/CVE-2017-12837.patch32
-rw-r--r--meta/recipes-devtools/perl/perl_5.24.1.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch b/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch
new file mode 100644
index 0000000000..0b59fcda3e
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch
@@ -0,0 +1,32 @@
1From 73d7247ecab863ef26b5687a37ccc75d6144ad0f Mon Sep 17 00:00:00 2001
2From: Karl Williamson <khw@cpan.org>
3Date: Tue, 17 Oct 2017 13:49:14 +0800
4Subject: [PATCH] fix CVE-2017-12837
5
6Signed-off-by: Karl Williamson <khw@cpan.org>
7Signed-off-by: Steve Hay <steve.m.hay@googlemail.com>
8
9CVE: CVE-2017-12837
10Upstream-Status: Backport
11https://perl5.git.perl.org/perl.git/commitdiff/96c83ed78aeea1a0496dd2b2d935869a822dc8a5
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 regcomp.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/regcomp.c b/regcomp.c
19index 5498d14..31ec383 100644
20--- a/regcomp.c
21+++ b/regcomp.c
22@@ -13021,6 +13021,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
23 goto loopdone;
24 }
25 p = RExC_parse;
26+ RExC_parse = parse_start;
27 if (ender > 0xff) {
28 REQUIRE_UTF8(flagp);
29 }
30--
311.8.3.1
32
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index 6b16689386..2574886784 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -65,6 +65,7 @@ SRC_URI += " \
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 file://CVE-2017-12883.patch \
68 file://CVE-2017-12837.patch \
68" 69"
69 70
70# Fix test case issues 71# Fix test case issues