diff options
| -rw-r--r-- | php-bug78875.patch | 38 | ||||
| -rw-r--r-- | php-bug78876.patch | 74 | ||||
| -rw-r--r-- | php.spec | 13 |
3 files changed, 124 insertions, 1 deletions
diff --git a/php-bug78875.patch b/php-bug78875.patch new file mode 100644 index 0000000..87bc103 --- /dev/null +++ b/php-bug78875.patch @@ -0,0 +1,38 @@ +From a8aca370e9ba4d9b402f1c6256653c683c4019a1 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Wed, 18 Mar 2020 10:26:53 +0100 +Subject: [PATCH] Fix #78875: Long filenames cause OOM and temp files are not + cleaned + +We must not cast `size_t` to `int` (unless the `size_t` value is +guaranteed to be less than or equal to `INT_MAX`). In this case we can +declare `array_len` as `size_t` in the first place. + +(cherry picked from commit 1c9bd513ac5c7c1d13d7f0dfa7c16a7ad2ce0f87) +--- + main/rfc1867.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/main/rfc1867.c b/main/rfc1867.c +index 5949802d6d..ee07ea557d 100644 +--- a/main/rfc1867.c ++++ b/main/rfc1867.c +@@ -690,7 +690,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */ + char *boundary, *s = NULL, *boundary_end = NULL, *start_arr = NULL, *array_index = NULL; + char *lbuf = NULL, *abuf = NULL; + zend_string *temp_filename = NULL; +- int boundary_len = 0, cancel_upload = 0, is_arr_upload = 0, array_len = 0; ++ int boundary_len = 0, cancel_upload = 0, is_arr_upload = 0; ++ size_t array_len = 0; + int64_t total_bytes = 0, max_file_size = 0; + int skip_upload = 0, anonindex = 0, is_anonymous; + HashTable *uploaded_files = NULL; +@@ -1124,7 +1125,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */ + is_arr_upload = (start_arr = strchr(param,'[')) && (param[strlen(param)-1] == ']'); + + if (is_arr_upload) { +- array_len = (int)strlen(start_arr); ++ array_len = strlen(start_arr); + if (array_index) { + efree(array_index); + } diff --git a/php-bug78876.patch b/php-bug78876.patch new file mode 100644 index 0000000..d6333b5 --- /dev/null +++ b/php-bug78876.patch @@ -0,0 +1,74 @@ +From 07007c74a4f30407668548bfb8ab67eb48fcb2f3 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Wed, 18 Mar 2020 10:57:42 +0100 +Subject: [PATCH] Fix #78876: Long variables cause OOM and temp files are not + cleaned + +We use the proper type for size calculations, which is `size_t`. + +(cherry picked from commit 3c8582ca4b8e84e5647220b647914876d2c3b124) +--- + main/rfc1867.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/main/rfc1867.c b/main/rfc1867.c +index ee07ea557d..6159284311 100644 +--- a/main/rfc1867.c ++++ b/main/rfc1867.c +@@ -614,7 +614,7 @@ static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int ne + } + + /* read until a boundary condition */ +-static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes, int *end) ++static size_t multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes, int *end) + { + size_t len, max; + char *bound; +@@ -653,7 +653,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes + self->buf_begin += len; + } + +- return (int)len; ++ return len; + } + + /* +@@ -663,7 +663,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes + static char *multipart_buffer_read_body(multipart_buffer *self, size_t *len) + { + char buf[FILLUNIT], *out=NULL; +- int total_bytes=0, read_bytes=0; ++ size_t total_bytes=0, read_bytes=0; + + while((read_bytes = multipart_buffer_read(self, buf, sizeof(buf), NULL))) { + out = erealloc(out, total_bytes + read_bytes + 1); +From c2776813404fbf5d35e3cc7b3d831f449887b0e5 Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev <stas@php.net> +Date: Mon, 11 May 2020 14:28:51 -0700 +Subject: [PATCH] Update NEWS + +(cherry picked from commit b4afd21428e09133228fd84bf048157526c2c705) +(cherry picked from commit f1a89efe27650b62d58fceb77252480b19da6555) +--- + NEWS | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/NEWS b/NEWS +index 6310d94581..e153539d98 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,14 @@ + PHP NEWS + ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| + ++Backported from 7.2.31 ++ ++- Core: ++ . Fixed bug #78875 (Long filenames cause OOM and temp files are not cleaned). ++ (CVE-2019-11048) (cmb) ++ . Fixed bug #78876 (Long variables in multipart/form-data cause OOM and temp ++ files are not cleaned). (CVE-2019-11048) (cmb) ++ + Backported from 7.2.30 + + - Standard: @@ -141,7 +141,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}} -Release: 20%{?dist} +Release: 21%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -247,6 +247,8 @@ Patch238: php-bug79282.patch Patch239: php-bug79329.patch Patch240: php-bug79330.patch Patch241: php-bug79465.patch +Patch242: php-bug78875.patch +Patch243: php-bug78876.patch # Fixes for tests (300+) # Factory is droped from system tzdata @@ -1031,6 +1033,8 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch239 -p1 -b .bug79329 %patch240 -p1 -b .bug79330 %patch241 -p1 -b .bug79465 +%patch242 -p1 -b .bug78875 +%patch243 -p1 -b .bug78876 : --------------------------- #exit 1 @@ -1983,6 +1987,13 @@ EOF %changelog +* Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.0.33-21 +- Core: + Fix #78875 Long filenames cause OOM and temp files are not cleaned + CVE-2019-11048 + Fix #78876 Long variables in multipart/form-data cause OOM and temp + files are not cleaned + * Tue Apr 14 2020 Remi Collet <remi@remirepo.net> - 7.0.33-20 - standard: Fix #79330 shell_exec silently truncates after a null byte |