diff --git a/SOURCES/perl-5.30.1-study_chunk-avoid-mutating-regexp-program-within-GOS.patch b/SOURCES/perl-5.30.1-study_chunk-avoid-mutating-regexp-program-within-GOS.patch deleted file mode 100644 index 70e5ed0..0000000 --- a/SOURCES/perl-5.30.1-study_chunk-avoid-mutating-regexp-program-within-GOS.patch +++ /dev/null @@ -1,306 +0,0 @@ -From 783ddef8fc74b00cde72898c2c3228853dc82d91 Mon Sep 17 00:00:00 2001 -From: Hugo van der Sanden -Date: Sat, 11 Apr 2020 14:10:24 +0100 -Subject: [PATCH] study_chunk: avoid mutating regexp program within GOSUB -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gh16947 and gh17743: studying GOSUB may restudy in an inner call -(via a mix of recursion and enframing) something that an outer call -is in the middle of looking at. Let the outer frame deal with it. - -(CVE-2020-12723) - -(cherry picked from commit c4033e740bd18d9fbe3456a9db2ec2053cdc5271) -Petr Písař: Ported to 5.30.1 from -66bbb51b93253a3f87d11c2695cfb7bdb782184a. -Signed-off-by: Petr Písař ---- - embed.fnc | 2 +- - embed.h | 2 +- - proto.h | 2 +- - regcomp.c | 54 +++++++++++++++++++++++++++++++++++------------------- - t/re/pat.t | 26 +++++++++++++++++++++++++- - 5 files changed, 63 insertions(+), 23 deletions(-) - -diff --git a/embed.fnc b/embed.fnc -index 1b9cf54..d0463e4 100644 ---- a/embed.fnc -+++ b/embed.fnc -@@ -2482,7 +2482,7 @@ Es |SSize_t|study_chunk |NN RExC_state_t *pRExC_state \ - |NULLOK struct scan_data_t *data \ - |I32 stopparen|U32 recursed_depth \ - |NULLOK regnode_ssc *and_withp \ -- |U32 flags|U32 depth -+ |U32 flags|U32 depth|bool was_mutate_ok - Es |void |rck_elide_nothing|NN regnode *node - EsR |SV * |get_ANYOFM_contents|NN const regnode * n - EsRn |U32 |add_data |NN RExC_state_t* const pRExC_state \ -diff --git a/embed.h b/embed.h -index cf44011..72c2a8e 100644 ---- a/embed.h -+++ b/embed.h -@@ -1239,7 +1239,7 @@ - #define ssc_is_cp_posixl_init S_ssc_is_cp_posixl_init - #define ssc_or(a,b,c) S_ssc_or(aTHX_ a,b,c) - #define ssc_union(a,b,c) S_ssc_union(aTHX_ a,b,c) --#define study_chunk(a,b,c,d,e,f,g,h,i,j,k) S_study_chunk(aTHX_ a,b,c,d,e,f,g,h,i,j,k) -+#define study_chunk(a,b,c,d,e,f,g,h,i,j,k,l) S_study_chunk(aTHX_ a,b,c,d,e,f,g,h,i,j,k,l) - # endif - # if defined(PERL_IN_REGCOMP_C) || defined (PERL_IN_DUMP_C) - #define _invlist_dump(a,b,c,d) Perl__invlist_dump(aTHX_ a,b,c,d) -diff --git a/proto.h b/proto.h -index ee74153..9a3ce27 100644 ---- a/proto.h -+++ b/proto.h -@@ -5671,7 +5671,7 @@ PERL_STATIC_INLINE void S_ssc_union(pTHX_ regnode_ssc *ssc, SV* const invlist, c - #define PERL_ARGS_ASSERT_SSC_UNION \ - assert(ssc); assert(invlist) - #endif --STATIC SSize_t S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, SSize_t *minlenp, SSize_t *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U32 recursed_depth, regnode_ssc *and_withp, U32 flags, U32 depth); -+STATIC SSize_t S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, SSize_t *minlenp, SSize_t *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U32 recursed_depth, regnode_ssc *and_withp, U32 flags, U32 depth, bool was_mutate_ok); - #define PERL_ARGS_ASSERT_STUDY_CHUNK \ - assert(pRExC_state); assert(scanp); assert(minlenp); assert(deltap); assert(last) - #endif -diff --git a/regcomp.c b/regcomp.c -index b101752..b9ea2a0 100644 ---- a/regcomp.c -+++ b/regcomp.c -@@ -106,6 +106,7 @@ typedef struct scan_frame { - regnode *next_regnode; /* next node to process when last is reached */ - U32 prev_recursed_depth; - I32 stopparen; /* what stopparen do we use */ -+ bool in_gosub; /* this or an outer frame is for GOSUB */ - - struct scan_frame *this_prev_frame; /* this previous frame */ - struct scan_frame *prev_frame; /* previous frame */ -@@ -4475,7 +4476,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - I32 stopparen, - U32 recursed_depth, - regnode_ssc *and_withp, -- U32 flags, U32 depth) -+ U32 flags, U32 depth, bool was_mutate_ok) - /* scanp: Start here (read-write). */ - /* deltap: Write maxlen-minlen here. */ - /* last: Stop before this one. */ -@@ -4554,6 +4555,10 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - node length to get a real minimum (because - the folded version may be shorter) */ - bool unfolded_multi_char = FALSE; -+ /* avoid mutating ops if we are anywhere within the recursed or -+ * enframed handling for a GOSUB: the outermost level will handle it. -+ */ -+ bool mutate_ok = was_mutate_ok && !(frame && frame->in_gosub); - /* Peephole optimizer: */ - DEBUG_STUDYDATA("Peep", data, depth, is_inf); - DEBUG_PEEP("Peep", scan, depth, flags); -@@ -4564,7 +4569,8 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - * parsing code, as each (?:..) is handled by a different invocation of - * reg() -- Yves - */ -- JOIN_EXACT(scan,&min_subtract, &unfolded_multi_char, 0); -+ if (mutate_ok) -+ JOIN_EXACT(scan,&min_subtract, &unfolded_multi_char, 0); - - /* Follow the next-chain of the current node and optimize - away all the NOTHINGs from it. -@@ -4596,7 +4602,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - /* DEFINEP study_chunk() recursion */ - (void)study_chunk(pRExC_state, &scan, &minlen, - &deltanext, next, &data_fake, stopparen, -- recursed_depth, NULL, f, depth+1); -+ recursed_depth, NULL, f, depth+1, mutate_ok); - - scan = next; - } else -@@ -4664,7 +4670,8 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - /* recurse study_chunk() for each BRANCH in an alternation */ - minnext = study_chunk(pRExC_state, &scan, minlenp, - &deltanext, next, &data_fake, stopparen, -- recursed_depth, NULL, f, depth+1); -+ recursed_depth, NULL, f, depth+1, -+ mutate_ok); - - if (min1 > minnext) - min1 = minnext; -@@ -4731,9 +4738,10 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - } - } - -- if (PERL_ENABLE_TRIE_OPTIMISATION && -- OP( startbranch ) == BRANCH ) -- { -+ if (PERL_ENABLE_TRIE_OPTIMISATION -+ && OP(startbranch) == BRANCH -+ && mutate_ok -+ ) { - /* demq. - - Assuming this was/is a branch we are dealing with: 'scan' -@@ -5188,6 +5196,9 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - newframe->stopparen = stopparen; - newframe->prev_recursed_depth = recursed_depth; - newframe->this_prev_frame= frame; -+ newframe->in_gosub = ( -+ (frame && frame->in_gosub) || OP(scan) == GOSUB -+ ); - - DEBUG_STUDYDATA("frame-new", data, depth, is_inf); - DEBUG_PEEP("fnew", scan, depth, flags); -@@ -5345,7 +5356,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - - /* This temporary node can now be turned into EXACTFU, and - * must, as regexec.c doesn't handle it */ -- if (OP(next) == EXACTFU_S_EDGE) { -+ if (OP(next) == EXACTFU_S_EDGE && mutate_ok) { - OP(next) = EXACTFU; - } - -@@ -5353,8 +5364,9 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - && isALPHA_A(* STRING(next)) - && ( OP(next) == EXACTFAA - || ( OP(next) == EXACTFU -- && ! HAS_NONLATIN1_SIMPLE_FOLD_CLOSURE(* STRING(next))))) -- { -+ && ! HAS_NONLATIN1_SIMPLE_FOLD_CLOSURE(* STRING(next)))) -+ && mutate_ok -+ ) { - /* These differ in just one bit */ - U8 mask = ~ ('A' ^ 'a'); - -@@ -5441,7 +5453,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - (mincount == 0 - ? (f & ~SCF_DO_SUBSTR) - : f) -- ,depth+1); -+ , depth+1, mutate_ok); - - if (flags & SCF_DO_STCLASS) - data->start_class = oclass; -@@ -5507,7 +5519,9 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - if ( OP(oscan) == CURLYX && data - && data->flags & SF_IN_PAR - && !(data->flags & SF_HAS_EVAL) -- && !deltanext && minnext == 1 ) { -+ && !deltanext && minnext == 1 -+ && mutate_ok -+ ) { - /* Try to optimize to CURLYN. */ - regnode *nxt = NEXTOPER(oscan) + EXTRA_STEP_2ARGS; - regnode * const nxt1 = nxt; -@@ -5557,10 +5571,10 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - && !(data->flags & SF_HAS_EVAL) - && !deltanext /* atom is fixed width */ - && minnext != 0 /* CURLYM can't handle zero width */ -- - /* Nor characters whose fold at run-time may be - * multi-character */ - && ! (RExC_seen & REG_UNFOLDED_MULTI_SEEN) -+ && mutate_ok - ) { - /* XXXX How to optimize if data == 0? */ - /* Optimize to a simpler form. */ -@@ -5613,7 +5627,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - /* recurse study_chunk() on optimised CURLYX => CURLYM */ - study_chunk(pRExC_state, &nxt1, minlenp, &deltanext, nxt, - NULL, stopparen, recursed_depth, NULL, 0, -- depth+1); -+ depth+1, mutate_ok); - } - else - oscan->flags = 0; -@@ -6018,7 +6032,8 @@ Perl_re_printf( aTHX_ "LHS=%" UVuf " RHS=%" UVuf "\n", - /* recurse study_chunk() for lookahead body */ - minnext = study_chunk(pRExC_state, &nscan, minlenp, &deltanext, - last, &data_fake, stopparen, -- recursed_depth, NULL, f, depth+1); -+ recursed_depth, NULL, f, depth+1, -+ mutate_ok); - if (scan->flags) { - if ( deltanext < 0 - || deltanext > (I32) U8_MAX -@@ -6123,7 +6138,7 @@ Perl_re_printf( aTHX_ "LHS=%" UVuf " RHS=%" UVuf "\n", - *minnextp = study_chunk(pRExC_state, &nscan, minnextp, - &deltanext, last, &data_fake, - stopparen, recursed_depth, NULL, -- f, depth+1); -+ f, depth+1, mutate_ok); - if (scan->flags) { - assert(0); /* This code has never been tested since this - is normally not compiled */ -@@ -6291,7 +6306,8 @@ Perl_re_printf( aTHX_ "LHS=%" UVuf " RHS=%" UVuf "\n", - /* optimise study_chunk() for TRIE */ - minnext = study_chunk(pRExC_state, &scan, minlenp, - &deltanext, (regnode *)nextbranch, &data_fake, -- stopparen, recursed_depth, NULL, f, depth+1); -+ stopparen, recursed_depth, NULL, f, depth+1, -+ mutate_ok); - } - if (nextbranch && PL_regkind[OP(nextbranch)]==BRANCH) - nextbranch= regnext((regnode*)nextbranch); -@@ -8084,7 +8100,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, - &data, -1, 0, NULL, - SCF_DO_SUBSTR | SCF_WHILEM_VISITED_POS | stclass_flag - | (restudied ? SCF_TRIE_DOING_RESTUDY : 0), -- 0); -+ 0, TRUE); - - - CHECK_RESTUDY_GOTO_butfirst(LEAVE_with_name("study_chunk")); -@@ -8213,7 +8229,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, - SCF_DO_STCLASS_AND|SCF_WHILEM_VISITED_POS|(restudied - ? SCF_TRIE_DOING_RESTUDY - : 0), -- 0); -+ 0, TRUE); - - CHECK_RESTUDY_GOTO_butfirst(NOOP); - -diff --git a/t/re/pat.t b/t/re/pat.t -index 6a868f4..ba89a58 100644 ---- a/t/re/pat.t -+++ b/t/re/pat.t -@@ -25,7 +25,7 @@ BEGIN { - skip_all('no re module') unless defined &DynaLoader::boot_DynaLoader; - skip_all_without_unicode_tables(); - --plan tests => 864; # Update this when adding/deleting tests. -+plan tests => 868; # Update this when adding/deleting tests. - - run_tests() unless caller; - -@@ -2115,6 +2115,30 @@ x{0c!}\;\;îçÿ