fix: honour open_basedir and stop mutating the caller's array - #13
Open
somethingwithproof wants to merge 13 commits into
Open
fix: honour open_basedir and stop mutating the caller's array#13somethingwithproof wants to merge 13 commits into
somethingwithproof wants to merge 13 commits into
Conversation
Without tests/data the SKIPIF blocks skip 16 of the 22 tests, so CI reported green while most of the suite never ran. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Both were written against an older librrd and fail against 1.7.2 and 1.11.0 alike; they were never noticed because the fixtures were missing. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Called with one argument, zend_parse_parameters never writes start_time, so the following `if (start_time)` dereferenced whatever the stack happened to hold and copied it into the --start option. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
An integer key gave RRDUpdater::update() a NULL zend_string, save() on a bare RRDCreator merged undefined zvals, and every method assumed __construct had run; all three reached librrd through a NULL pointer. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
ZEND_LTOA writes its terminator at the return value of snprintf, so an 11-byte buffer overflowed once a timestamp needed more than ten digits, and rrd_fetch's 32-bit loop counter wrapped past the end of librrd's data. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
A second __construct kept the previous step, data sources and archives, so the new file was written from the old object's definition. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Both write a file the caller names, and both skipped the check that rrd_create() and RRDGraph::save() already perform. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
convert_to_string() edited the array in place, so a non-string option changed the caller's variable and every by-value copy of it. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
zval_get_string() hands back an empty string with an exception already pending, so the original Error was masked by whatever librrd then reported. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Converting a value runs __toString, which can call __construct to repoint the object past the open_basedir check, or setOptions to free the array being walked. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
…t list Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
The "was not constructed" guards test for NULL, and rrd_fetch keyed its per-source arrays by name, so duplicate names left the walk short of ds_cnt entries. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
… objects The duplicate-name case is a crash on master: renaming one ds_nam over another in the header leaves rrd_fetch walking past the end of the array it built. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
This was referenced Aug 21, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Two behaviours that differ from the procedural functions beside them.
open_basedir.
rrd_create()andRRDGraph::save()callphp_check_open_basedir();RRDCreator::save()andRRDGraph::saveVerbose()do not, though both write a file the caller names. Withopen_basedir=/allowed:/poc:/tmpon master, the checked pair returns false and the unchecked pair writes:Nothing lands there after the change. Worth saying plainly: php/policies lists "requires an open_basedir bypass" under not a security issue, so this is filed as the consistency fix it is, not as a vulnerability.
Value semantics. Building the argument list calls
convert_to_string()on the array elements, which rewrites them in place. The options array is shared with the caller and with any by-value copy of it, so a non-string option changes variables that were never passed in:zval_get_string()on a released temporary leaves the caller's array alone. Same fix inRRDGraph's option builder and inRRDUpdater::update(), where the data source name also moves fromsmart_string_appendstosmart_string_appendlso an embedded NUL stops silently truncating it.Scope, so the title does not over-promise. These checks cover the output path each method writes. The RRD files a graph reads are named inside the options array (
DEF:v=/any/path.rrd:ds:AVG) and are still unchecked, andrrd_xporthas nophp_check_open_basedircall at all. Both gaps are pre-existing and out of scope here; happy to file a follow-up.One more thing in the same lines.
zval_get_string()returns an empty string with an exception already pending for a value that cannot be converted, so the originalErrorwas masked by whatever librrd reported next.zval_try_get_string()plus a bail-out lets it surface, which is whatrrd_031.phptasserts.Validation
php:8.4-cli with librrd 1.7.2 and macOS with librrd 1.11.0: 36/36 pass on PHP 8.1, 8.3, 8.4, 8.5 and 8.6.0-dev. Stacked on #12.
Two more, found while testing this
The check was bypassable.
__constructis callable again (previous PR), and the path is read once for the check and again to build the argv, with__toStringin between. A value object whose__toStringcalls$updater->__construct('/outside.rrd')moved the write outsideopen_basedir:The path is now snapshotted straight after the check.
rrd_032.phptasserts the write lands on the checked path.Use-after-free in the graph option walk.
RRDGraph::save()iterates an array owned solely by the object, andsetOptions()from inside__toStringfrees it mid-walk:Pre-existing, but this branch makes conversion run on every call rather than only the first, so it widens it. A reference is now held across the walk;
rrd_033.phptcovers it.And
rrd_fetchon duplicate data source names. The per-timestamp walk assumes the array it built hasds_cntentries, but it is keyed by name, so two identical names collapse into one andzend_hash_get_current_data()returns NULL intoadd_assoc_double(). Renaming oneds_namover another in the header reproduces it:add_assoc_double (arg=0x0, key=0x... "920804700") at rrd.c:133.rrd_034.phptbuilds such a file and asserts no crash.Stack order. This is part of a series, each building on the one before. Merge order:
#11 (test suite) → #12 (memory safety) → #13 (open_basedir, value semantics) → #14 (php-src master) → #15 (librrd argv) → #16 (argument builder) → #17 (autoconf). Commits below this PR's own belong to the ones underneath it.