From 00a29b7cddba2fa25c1af4d4dbc50705a78176a5 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 8 Apr 2022 14:08:12 -0400 Subject: [PATCH] Avoid large stack usage, require perl core modules Rewrite filter/filter-out to avoid large stack usage. Require perl core modules for testsuite Resolves: #2010506 Reviewed-by: Carlos O'Donell --- make-4.3-filter-out.patch | 268 ++++++++++++++++++++++++++++++++++++++ make.spec | 13 +- 2 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 make-4.3-filter-out.patch diff --git a/make-4.3-filter-out.patch b/make-4.3-filter-out.patch new file mode 100644 index 0000000..bdd2fcc --- /dev/null +++ b/make-4.3-filter-out.patch @@ -0,0 +1,268 @@ +From e49e11e069fe7f214263be1782242b9b50f71eaa Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Thu, 12 Nov 2020 17:00:39 -0500 +Subject: [SV 59093] Rewrite filter/filter-out to avoid large stack usage + +* src/function.c (func_filter_filterout): Allocate arrays to hold +pattern and word information rather than creating linked lists on +the stack. +* tests/scripts/functions/filter-out: Test large filters. + +diff --git a/src/function.c b/src/function.c +index 0917e0cd..5edfe8b3 100644 +--- a/src/function.c ++++ b/src/function.c +@@ -910,7 +910,6 @@ func_foreach (char *o, char **argv, const char *funcname UNUSED) + + struct a_word + { +- struct a_word *next; + struct a_word *chain; + char *str; + size_t length; +@@ -941,7 +940,6 @@ a_word_hash_cmp (const void *x, const void *y) + + struct a_pattern + { +- struct a_pattern *next; + char *str; + char *percent; + size_t length; +@@ -950,78 +948,84 @@ struct a_pattern + static char * + func_filter_filterout (char *o, char **argv, const char *funcname) + { +- struct a_word *wordhead; +- struct a_word **wordtail; ++ struct a_word *words; ++ struct a_word *word_end; + struct a_word *wp; +- struct a_pattern *pathead; +- struct a_pattern **pattail; ++ struct a_pattern *patterns; ++ struct a_pattern *pat_end; + struct a_pattern *pp; ++ size_t pat_count = 0, word_count = 0; + + struct hash_table a_word_table; + int is_filter = funcname[CSTRLEN ("filter")] == '\0'; +- const char *pat_iterator = argv[0]; +- const char *word_iterator = argv[1]; ++ const char *cp; + int literals = 0; +- int words = 0; + int hashing = 0; + char *p; + size_t len; ++ int doneany = 0; + +- /* Chop ARGV[0] up into patterns to match against the words. +- We don't need to preserve it because our caller frees all the +- argument memory anyway. */ ++ /* Find the number of words and get memory for them. */ ++ cp = argv[1]; ++ while ((p = find_next_token (&cp, NULL)) != 0) ++ ++word_count; + +- pattail = &pathead; +- while ((p = find_next_token (&pat_iterator, &len)) != 0) +- { +- struct a_pattern *pat = alloca (sizeof (struct a_pattern)); ++ if (!word_count) ++ return o; ++ ++ words = xcalloc (word_count * sizeof (struct a_word)); ++ word_end = words + word_count; + +- *pattail = pat; +- pattail = &pat->next; ++ /* Find the number of patterns and get memory for them. */ ++ cp = argv[0]; ++ while ((p = find_next_token (&cp, NULL)) != 0) ++ ++pat_count; + +- if (*pat_iterator != '\0') +- ++pat_iterator; ++ patterns = xcalloc (pat_count * sizeof (struct a_pattern)); ++ pat_end = patterns + pat_count; ++ ++ /* Chop argv[0] up into patterns to match against the words. */ ++ ++ cp = argv[0]; ++ pp = patterns; ++ while ((p = find_next_token (&cp, &len)) != 0) ++ { ++ if (*cp != '\0') ++ ++cp; + +- pat->str = p; + p[len] = '\0'; +- pat->percent = find_percent (p); +- if (pat->percent == 0) ++ pp->str = p; ++ pp->percent = find_percent (p); ++ if (pp->percent == 0) + literals++; +- + /* find_percent() might shorten the string so LEN is wrong. */ +- pat->length = strlen (pat->str); ++ pp->length = strlen (pp->str); ++ ++ ++pp; + } +- *pattail = 0; + + /* Chop ARGV[1] up into words to match against the patterns. */ + +- wordtail = &wordhead; +- while ((p = find_next_token (&word_iterator, &len)) != 0) ++ cp = argv[1]; ++ wp = words; ++ while ((p = find_next_token (&cp, &len)) != 0) + { +- struct a_word *word = alloca (sizeof (struct a_word)); +- +- *wordtail = word; +- wordtail = &word->next; +- +- if (*word_iterator != '\0') +- ++word_iterator; ++ if (*cp != '\0') ++ ++cp; + + p[len] = '\0'; +- word->str = p; +- word->length = len; +- word->matched = 0; +- word->chain = 0; +- words++; ++ wp->str = p; ++ wp->length = len; ++ ++wp; + } +- *wordtail = 0; + + /* Only use a hash table if arg list lengths justifies the cost. */ +- hashing = (literals >= 2 && (literals * words) >= 10); ++ hashing = (literals > 1 && (literals * word_count) >= 10); + if (hashing) + { +- hash_init (&a_word_table, words, a_word_hash_1, a_word_hash_2, ++ hash_init (&a_word_table, word_count, a_word_hash_1, a_word_hash_2, + a_word_hash_cmp); +- for (wp = wordhead; wp != 0; wp = wp->next) ++ for (wp = words; wp < word_end; ++wp) + { + struct a_word *owp = hash_insert (&a_word_table, wp); + if (owp) +@@ -1029,51 +1033,49 @@ func_filter_filterout (char *o, char **argv, const char *funcname) + } + } + +- if (words) ++ /* Run each pattern through the words, killing words. */ ++ for (pp = patterns; pp < pat_end; ++pp) + { +- int doneany = 0; +- +- /* Run each pattern through the words, killing words. */ +- for (pp = pathead; pp != 0; pp = pp->next) ++ if (pp->percent) ++ for (wp = words; wp < word_end; ++wp) ++ wp->matched |= pattern_matches (pp->str, pp->percent, wp->str); ++ else if (hashing) + { +- if (pp->percent) +- for (wp = wordhead; wp != 0; wp = wp->next) +- wp->matched |= pattern_matches (pp->str, pp->percent, wp->str); +- else if (hashing) ++ struct a_word a_word_key; ++ a_word_key.str = pp->str; ++ a_word_key.length = pp->length; ++ wp = hash_find_item (&a_word_table, &a_word_key); ++ while (wp) + { +- struct a_word a_word_key; +- a_word_key.str = pp->str; +- a_word_key.length = pp->length; +- wp = hash_find_item (&a_word_table, &a_word_key); +- while (wp) +- { +- wp->matched |= 1; +- wp = wp->chain; +- } ++ wp->matched |= 1; ++ wp = wp->chain; + } +- else +- for (wp = wordhead; wp != 0; wp = wp->next) +- wp->matched |= (wp->length == pp->length +- && strneq (pp->str, wp->str, wp->length)); + } ++ else ++ for (wp = words; wp < word_end; ++wp) ++ wp->matched |= (wp->length == pp->length ++ && strneq (pp->str, wp->str, wp->length)); ++ } + +- /* Output the words that matched (or didn't, for filter-out). */ +- for (wp = wordhead; wp != 0; wp = wp->next) +- if (is_filter ? wp->matched : !wp->matched) +- { +- o = variable_buffer_output (o, wp->str, strlen (wp->str)); +- o = variable_buffer_output (o, " ", 1); +- doneany = 1; +- } ++ /* Output the words that matched (or didn't, for filter-out). */ ++ for (wp = words; wp < word_end; ++wp) ++ if (is_filter ? wp->matched : !wp->matched) ++ { ++ o = variable_buffer_output (o, wp->str, strlen (wp->str)); ++ o = variable_buffer_output (o, " ", 1); ++ doneany = 1; ++ } + +- if (doneany) +- /* Kill the last space. */ +- --o; +- } ++ if (doneany) ++ /* Kill the last space. */ ++ --o; + + if (hashing) + hash_free (&a_word_table, 0); + ++ free (patterns); ++ free (words); ++ + return o; + } + +diff --git a/tests/scripts/functions/filter-out b/tests/scripts/functions/filter-out +index 1fe4819d..dec5343e 100644 +--- a/tests/scripts/functions/filter-out ++++ b/tests/scripts/functions/filter-out +@@ -27,6 +27,22 @@ all: ; @echo '$(files1) $(files2)' + !, + '', "foo.elc foo.elc\n"); + ++# Force use of hash (see function.c:func_filter_filterout for params) ++ ++my $base = 'foo.1 foo.2 foo.3 foo.4 foo.5 foo.6 foo.7 foo.8 foo.9 foo.10'; ++ ++my $base10 = join(' ', ($base) x 10); ++my $out3 = join(' ', ('foo.3') x 10); ++my $out456 = join(' ', ('foo.4 foo.5 foo.6') x 10); ++ ++run_make_test("words := $base10" . q! ++files1 := $(filter %.3, $(words)) ++files2 := $(filter %.4 foo.5 foo.6, $(words)) ++all: ; @echo '$(files1) $(files2)' ++!, ++ '', "$out3 $out456\n"); ++ ++ + # Escaped patterns + run_make_test(q!all:;@echo '$(filter foo\%bar,foo%bar fooXbar)'!, + '', "foo%bar\n"); diff --git a/make.spec b/make.spec index 01819ea..aced792 100644 --- a/make.spec +++ b/make.spec @@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users Name: make Epoch: 1 Version: 4.3 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/make/ Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz @@ -31,11 +31,16 @@ Patch2: make-4.3-j8k.patch # Remove on next make rebase Patch3: make-4.3-cloexec.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2010506 +# https://savannah.gnu.org/bugs/?59093 +# Remove on next make rebase +Patch4: make-4.3-filter-out.patch + # autoreconf BuildRequires: make BuildRequires: autoconf, automake, gettext-devel BuildRequires: procps -BuildRequires: perl-interpreter +BuildRequires: perl %if %{with guile} BuildRequires: pkgconfig(guile-2.2) %endif @@ -97,6 +102,10 @@ echo ============END TESTING=========== %{_includedir}/gnumake.h %changelog +* Fri Apr 8 2022 DJ Delorie - 1:4.3-8 +- Rewrite filter/filter-out to avoid large stack usage. BZ #2010506 +- Require perl core modules for testsuite + * Thu Jan 20 2022 Fedora Release Engineering - 1:4.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild