diff options
| author | Phil Pennock <phil+git@pennock-tech.com> | 2020-10-29 21:38:25 -0400 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-04-28 00:40:23 +0200 |
| commit | a6e1f69d82adcfd3caab8f228d96750dfddc8f07 (patch) | |
| tree | 4dac833c184a6e0fd6635061e93d5b82db251adc | |
| parent | 9f06dcd6848052f2524658bf871c60a8d48c7dbe (diff) | |
| download | exim4-a6e1f69d82adcfd3caab8f228d96750dfddc8f07.tar.gz | |
SECURITY: default recipients_max to 50,000
A default of "unlimited" can have unfortunate consequences when people start
putting many millions of recipients on a message.
(cherry picked from commit 1d7780722a66cea8da5fa4ae0775e85d185fbf7e)
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 2 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/doc-txt/OptionLists.txt | 2 | ||||
| -rw-r--r-- | src/src/globals.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 446871125..9c66f5cc9 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -17200,7 +17200,7 @@ or if the message was submitted locally (not using TCP/IP), and the &%-bnq%& option was not set. -.option recipients_max main integer 0 +.option recipients_max main integer 50000 .cindex "limit" "number of recipients" .cindex "recipient" "maximum number" If this option is set greater than zero, it specifies the maximum number of diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index b6d5067ec..055b1ace8 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -189,6 +189,8 @@ PP/06 Fix CVE-2020-28016 (PFPZA): Heap out-of-bounds write in parse_fix_phrase() PP/07 Refuse to allocate too little memory, block negative/zero allocations. Security guard. +PP/08 Change default for recipients_max from unlimited to 50,000. + Exim version 4.94 ----------------- diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 8b2dee352..99e87067a 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -464,7 +464,7 @@ receive_timeout time 0s main received_header_text string* + main received_headers_max integer 30 main recipient_unqualified_hosts host list unset main 4.00 replacing receiver_unqualified_hosts -recipients_max integer 0 main 1.60 +recipients_max integer 50000 main 1.60 default changed in 4.95 (was 0) recipients_max_reject boolean false main 1.70 redirect_router string unset routers 4.00 remote_max_parallel integer 1 main diff --git a/src/src/globals.c b/src/src/globals.c index c34ac9ddd..532eed27f 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1272,7 +1272,7 @@ uschar *recipient_verify_failure = NULL; int recipients_count = 0; recipient_item *recipients_list = NULL; int recipients_list_max = 0; -int recipients_max = 0; +int recipients_max = 50000; const pcre *regex_AUTH = NULL; const pcre *regex_check_dns_names = NULL; const pcre *regex_From = NULL; |