Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/php-5_3/php-sapi/patches/280_php_20804024.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Tue, 16 Jun 2015 14:11:47 -0700
changeset 4494 f5b717124172
permissions -rw-r--r--
20192108 problem in UTILITY/PHP 20231115 problem in UTILITY/PHP 20936509 problem in UTILITY/PHP 20804024 problem in UTILITY/PHP 20804061 problem in UTILITY/PHP 20804135 problem in UTILITY/PHP 20804363 problem in UTILITY/PHP 20804424 problem in UTILITY/PHP 20433657 problem in UTILITY/PHP 20803998 problem in UTILITY/PHP 20804391 problem in UTILITY/PHP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4494
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     1
 
CVE-2014-9653
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     2
 
Community BUG:
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     3
 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9653
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     4
 
Community CODE:
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     5
 
https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     6
 
This patch was adapted from the community reports above.
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     7
 












f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




     8














f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




     9


--- php-5.3.29/ext/fileinfo/libmagic/readelf.c_orig	2015-06-12 16:40:10.463458900 -0700













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    10


+++ php-5.3.29/ext/fileinfo/libmagic/readelf.c	2015-06-12 16:59:36.213626077 -0700













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    11


@@ -313,7 +313,7 @@













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    12


 			file_badseek(ms);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    13


 			return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    14


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    15


-		if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    16


+		if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) < (ssize_t)xph_sizeof) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    17


 			file_badread(ms);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    18


 			return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    19


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    20


@@ -869,7 +869,7 @@













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    21


 			file_badseek(ms);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    22


 			return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    23


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    24


-		if (FINFO_READ_FUNC(fd, xsh_addr, xsh_sizeof) == -1) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    25


+		if (FINFO_READ_FUNC(fd, xsh_addr, xsh_sizeof) < (ssize_t)xsh_sizeof) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    26


 			file_badread(ms);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    27


 			return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    28


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    29


@@ -901,7 +901,7 @@













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    30


 				efree(nbuf);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    31


 				return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    32


 			}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    33


-			if (FINFO_READ_FUNC(fd, nbuf, (size_t)xsh_size) !=













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    34


+			if (FINFO_READ_FUNC(fd, nbuf, (size_t)xsh_size) <













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    35


 			    (ssize_t)xsh_size) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    36


 				efree(nbuf);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    37


 				file_badread(ms);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    38


@@ -1058,7 +1058,7 @@













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    39


 			return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    40


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    41


 













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    42


-  		if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    43


+  		if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) < (ssize_t)xph_sizeof) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    44


   			file_badread(ms);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    45


 			return -1;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    46


 		}















upstream/oracle/userland-gate