com php-src: Fix bug #67060: use default mode of 660: NEWS sapi/fpm/fpm/fpm_unix.c sapi/fpm/php-fpm.conf.in

Commit: 8a22540a95db7c8a9857efc2ced8b91ceffda238 Author: Stanislav Malyshev <stas@php.net> Tue, 15 Apr 2014 10:43:24 -0700 Parents: 4b48b299885bf0e2f2c72902b072c28f255e8f68 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a22540a95db7c8a9857efc2ced8b91ceffda238 Log: Fix bug #67060: use default mode of 660 Bugs: https://bugs.php.net/67060 Changed paths: M NEWS M sapi/fpm/fpm/fpm_unix.c M sapi/fpm/php-fpm.conf.in Diff: diff --git a/NEWS b/NEWS index 72c0939..264b438 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,10 @@ PHP NEWS . Fixed memory corruption in openssl_x509_parse() (CVE-2013-6420). (Stefan Esser). +- FPM: + . Fixed bug #67060 (sapi/fpm: possible privilege escalation due to insecure + default configuration) (CVE-2014-0185). (Stas) + 11 Jul 2013, PHP 5.3.27 - Core: diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index 48249e8..ea0e673 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -35,7 +35,7 @@ int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp) /* {{{ */ /* uninitialized */ wp->socket_uid = -1; wp->socket_gid = -1; - wp->socket_mode = 0666; + wp->socket_mode = 0660; if (!c) { return 0; diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index 44e4dba..e8efc70 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -158,10 +158,10 @@ listen = 127.0.0.1:9000 ; permissions must be set in order to allow connections from a web server. Many ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user -; mode is set to 0666 +; mode is set to 0660 ;listen.owner = @php_fpm_user@ ;listen.group = @php_fpm_group@ -;listen.mode = 0666 +;listen.mode = 0660 ; List of ipv4 addresses of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original