-
Notifications
You must be signed in to change notification settings - Fork 8k
ext/soap: Fix integer overflow when decoding SOAP array indexes #21963
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
LamentXU123
wants to merge
1
commit into
php:PHP-8.4
Choose a base branch
from
LamentXU123:sec-fix
base: PHP-8.4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+171
−23
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| --TEST-- | ||
| SOAP array index overflow is rejected | ||
| --EXTENSIONS-- | ||
| soap | ||
| --FILE-- | ||
| <?php | ||
| class TestSoapClient extends SoapClient { | ||
| public string $response; | ||
|
|
||
| public function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string { | ||
| return $this->response; | ||
| } | ||
| } | ||
|
|
||
| function soap_response(string $attributes, string $itemAttributes = ''): string { | ||
| return <<<XML | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" | ||
| xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" | ||
| xmlns:xsd="http://www.w3.org/2001/XMLSchema" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:ns1="http://example.org/" | ||
| SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> | ||
| <SOAP-ENV:Body> | ||
| <ns1:testResponse> | ||
| <return $attributes> | ||
| <item xsi:type="xsd:string" $itemAttributes>value</item> | ||
| </return> | ||
| </ns1:testResponse> | ||
| </SOAP-ENV:Body> | ||
| </SOAP-ENV:Envelope> | ||
| XML; | ||
| } | ||
|
|
||
| function test_overflow(string $name, string $response): void { | ||
| $client = new TestSoapClient(NULL, [ | ||
| 'location' => 'test://', | ||
| 'uri' => 'http://example.org/', | ||
| 'exceptions' => true, | ||
| ]); | ||
| $client->response = $response; | ||
|
|
||
| try { | ||
| $client->test(); | ||
| echo "$name: no fault\n"; | ||
| } catch (SoapFault $e) { | ||
| echo "$name: $e->faultstring\n"; | ||
| } | ||
| } | ||
|
|
||
| function test_boundary_position(): void { | ||
| $client = new TestSoapClient(NULL, [ | ||
| 'location' => 'test://', | ||
| 'uri' => 'http://example.org/', | ||
| 'exceptions' => true, | ||
| ]); | ||
| $client->response = soap_response( | ||
| 'SOAP-ENC:arrayType="xsd:string[1]" xsi:type="SOAP-ENC:Array"', | ||
| 'SOAP-ENC:position="[2147483646]"' | ||
| ); | ||
|
|
||
| var_dump($client->test()); | ||
| } | ||
|
|
||
| test_overflow( | ||
| 'arrayType', | ||
| soap_response('SOAP-ENC:arrayType="xsd:string[2147483648]" xsi:type="SOAP-ENC:Array"') | ||
| ); | ||
|
|
||
| test_overflow( | ||
| 'offset', | ||
| soap_response('SOAP-ENC:arrayType="xsd:string[1]" SOAP-ENC:offset="[2147483648]" xsi:type="SOAP-ENC:Array"') | ||
| ); | ||
|
|
||
| test_overflow( | ||
| 'position', | ||
| soap_response('SOAP-ENC:arrayType="xsd:string[1]" xsi:type="SOAP-ENC:Array"', 'SOAP-ENC:position="[2147483647]"') | ||
| ); | ||
|
|
||
| test_boundary_position(); | ||
| ?> | ||
| --EXPECT-- | ||
| arrayType: SOAP-ERROR: Encoding: array index out of range | ||
| offset: SOAP-ERROR: Encoding: array index out of range | ||
| position: SOAP-ERROR: Encoding: array index out of range | ||
| array(1) { | ||
| [2147483646]=> | ||
| string(5) "value" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
indeed ;
soap_error0(E_ERROR, …)should always bail through the SOAP error handler in practice, but leaving ret pointing to freed array data on the off-chance thebailout path ever changes is a footgun we don't need. The
ZVAL_UNDEFkeeps the returned zval safe regardless.