Merge branch 'PHP-7.4' into PHP-8.0

Author: bukka

NEWS

@@ -8,6 +8,10 @@ PHP                                                                        NEWS
   . Fixed bug #81591 (Fatal Error not properly logged in particular cases).
     (Nikita)
 
+- FPM:
+  . Fixed bug #81513 (Future possibility for heap overflow in FPM zlog).
+    (Jakub Zelenka)
+
 - GD:
   . Fixed bug #71316 (libpng warning from imagecreatefromstring). (cmb)
 

sapi/fpm/fpm/zlog.c

@@ -414,7 +414,8 @@ static inline ssize_t zlog_stream_unbuffered_write(
 static inline ssize_t zlog_stream_buf_copy_cstr(
 		struct zlog_stream *stream, const char *str, size_t str_len) /* {{{ */
 {
-	if (stream->buf.size - stream->len <= str_len && !zlog_stream_buf_alloc_ex(stream, str_len)) {
+	if (stream->buf.size - stream->len <= str_len &&
+			!zlog_stream_buf_alloc_ex(stream, str_len + stream->len)) {
 		return -1;
 	}
 

sapi/fpm/tests/log-bwp-realloc-buffer.phpt

@@ -0,0 +1,52 @@
+--TEST--
+FPM: bug81513 - Buffered worker output plain log stream reallocation
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+error_log = {{FILE:LOG}}
+[unconfined]
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<EOT
+<?php
+file_put_contents('php://stderr', str_repeat('a', 100));
+usleep(20000);
+file_put_contents('php://stderr', str_repeat('b', 2500) . "\n");
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+$tester->terminate();
+var_dump($tester->getLastLogLine() === str_repeat('a', 100) . str_repeat('b', 923) . "\n");
+var_dump($tester->getLastLogLine() === str_repeat('b', 1023) . "\n");
+var_dump($tester->getLastLogLine() === str_repeat('b', 554) . "\n");
+$tester->close();
+
+?>
+Done
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>