mirror of
https://abf.rosa.ru/djam/php7.git
synced 2025-02-23 14:52:47 +00:00
fix CVE
This commit is contained in:
parent
92f461d0e5
commit
0f263225b5
2 changed files with 33 additions and 1 deletions
30
CVE-2022-4900.patch
Normal file
30
CVE-2022-4900.patch
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
# from https://github.com/php/php-src/commit/789a37f14405e2d1a05a76c9fb4ed2d49d4580d5#diff-0265438340ea11a73f2e268834e3ac37b52342d9a911b5c4193df0b0072895ecR2389
|
||||||
|
|
||||||
|
diff -ruN a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
|
||||||
|
--- a/sapi/cli/php_cli_server.c 2022-10-31 19:36:05.000000000 +0900
|
||||||
|
+++ b/sapi/cli/php_cli_server.c 2024-11-28 11:05:56.301504326 +0900
|
||||||
|
@@ -517,13 +517,8 @@
|
||||||
|
if (php_cli_server_workers_max > 1) {
|
||||||
|
zend_long php_cli_server_worker;
|
||||||
|
|
||||||
|
- php_cli_server_workers = calloc(
|
||||||
|
- php_cli_server_workers_max, sizeof(pid_t));
|
||||||
|
- if (!php_cli_server_workers) {
|
||||||
|
- php_cli_server_workers_max = 1;
|
||||||
|
-
|
||||||
|
- return SUCCESS;
|
||||||
|
- }
|
||||||
|
+ php_cli_server_workers = pecalloc(
|
||||||
|
+ php_cli_server_workers_max, sizeof(pid_t), 1);
|
||||||
|
|
||||||
|
php_cli_server_master = getpid();
|
||||||
|
|
||||||
|
@@ -2361,7 +2356,7 @@
|
||||||
|
!WIFSIGNALED(php_cli_server_worker_status));
|
||||||
|
}
|
||||||
|
|
||||||
|
- free(php_cli_server_workers);
|
||||||
|
+ pefree(php_cli_server_workers, 1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
} /* }}} */
|
|
@ -27,7 +27,7 @@
|
||||||
Summary: The PHP7 scripting language
|
Summary: The PHP7 scripting language
|
||||||
Name: php
|
Name: php
|
||||||
Version: 7.4.33
|
Version: 7.4.33
|
||||||
Release: 10
|
Release: 11
|
||||||
Source0: http://ch1.php.net/distributions/php-%{version}.tar.gz
|
Source0: http://ch1.php.net/distributions/php-%{version}.tar.gz
|
||||||
Source1: macros.php
|
Source1: macros.php
|
||||||
Group: Development/PHP
|
Group: Development/PHP
|
||||||
|
@ -87,6 +87,7 @@ Patch128: 0001-Revert-Throw-notice-on-array-access-on-illegal-type.patch
|
||||||
Patch200: fix-include-e2k.patch
|
Patch200: fix-include-e2k.patch
|
||||||
# fix for openssl3, rediff from https://git.remirepo.net/cgit/rpms/scl-php74/php.git/plain/php-7.4.26-openssl3.patch
|
# fix for openssl3, rediff from https://git.remirepo.net/cgit/rpms/scl-php74/php.git/plain/php-7.4.26-openssl3.patch
|
||||||
Patch201: php-7.4.33-openssl3.patch
|
Patch201: php-7.4.33-openssl3.patch
|
||||||
|
Patch202: CVE-2022-4900.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
@ -1298,6 +1299,7 @@ fi
|
||||||
%patch200 -p1
|
%patch200 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch201 -p1
|
%patch201 -p1
|
||||||
|
%patch202 -p1
|
||||||
|
|
||||||
cp %{SOURCE2} maxlifetime
|
cp %{SOURCE2} maxlifetime
|
||||||
cp %{SOURCE3} php.crond
|
cp %{SOURCE3} php.crond
|
||||||
|
|
Loading…
Add table
Reference in a new issue