Brad Bishop | 220d553 | 2018-08-14 00:59:39 +0100 | [diff] [blame] | 1 | From abe1e6c568b96bcb382dfa4f61c56d1ab001ea51 Mon Sep 17 00:00:00 2001 |
| 2 | From: Karl Williamson <khw@cpan.org> |
| 3 | Date: Fri, 2 Feb 2018 15:14:27 -0700 |
| 4 | Subject: [PATCH] (perl #132227) restart a node if we change to uni rules |
| 5 | within the node and encounter a sharp S |
| 6 | |
| 7 | This could lead to a buffer overflow. |
| 8 | |
| 9 | (cherry picked from commit a02c70e35d1313a5f4e245e8f863c810e991172d) |
| 10 | |
| 11 | CVE: CVE-2018-6797 |
| 12 | Upstream-Status: Backport [https://perl5.git.perl.org/perl.git/commitdiff/abe1e6c568b96bcb382dfa4f61c56d1ab001ea51] |
| 13 | |
| 14 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> |
| 15 | --- |
| 16 | regcomp.c | 12 ++++++++++++ |
| 17 | 1 file changed, 12 insertions(+) |
| 18 | |
| 19 | diff --git a/regcomp.c b/regcomp.c |
| 20 | index 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 | -- |
| 43 | 2.15.1-424-g9478a660812 |
| 44 | |
| 45 | |