Skip to content

[pull] master from php:master - #1056

Merged
pull[bot] merged 3 commits into
dolfly:masterfrom
php:master
Sep 1, 2026
Merged

[pull] master from php:master#1056
pull[bot] merged 3 commits into
dolfly:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Sep 1, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

lazerg and others added 3 commits September 1, 2026 19:32
…ngth

hash_pbkdf2() sized the digest buffer with ceil((float) length / 2.0) and
the block count with ceil((float) digest_length / (float) ops->digest_size).
A float carries 24 bits of mantissa, so past 2^24 the conversion rounds and
both counts come out wrong: rounding up makes zend_bin2hex() write past the
end of the return string, rounding down leaves the tail of the string
uninitialized. hash_pbkdf2('md5', 'password', 'salt', 1, 268435473) writes
8 bytes out of bounds under ASAN.

Both counts are exact in integer arithmetic, so this replaces them with
round-up divisions, which also avoids the signed overflow with an output
length of PHP_INT_MAX. <math.h> had no other user in the file.

Close GH-23380
* PHP-8.4:
  ext/hash: Fix buffer overflow in hash_pbkdf2() with a large output length
* PHP-8.5:
  ext/hash: Fix buffer overflow in hash_pbkdf2() with a large output length
@pull pull Bot locked and limited conversation to collaborators Sep 1, 2026
@pull pull Bot added the ⤵️ pull label Sep 1, 2026
@pull
pull Bot merged commit 759829b into dolfly:master Sep 1, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants