Skip to content

PFA: Fix UAF of inherited attribute argument value #23258

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.

Sign up for GitHub

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

Draft
arnaud-lb wants to merge 1 commit into
base: master
Choose a base branch
from
+64 −1
Draft

PFA: Fix UAF of inherited attribute argument value #23258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions Zend/tests/partial_application/attributes_004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
--TEST--
PFA attribute UAF
--CREDITS--
Ryan @ Calif.io
--FILE--
<?php

/* Reproduces with opcache.enable_cli=0. Not adding this to the INI section so
* that it's tested in all configurations. */

#[NoDiscard(ND_MESSAGE)]
function userTarget(mixed $value): mixed
{
return $value;
}

define('ND_MESSAGE', str_repeat('message-', 32).time());

function arguments(ReflectionFunction $function): array
{
return $function->getAttributes(NoDiscard::class)[0]->getArguments();
}

$original = new ReflectionFunction('userTarget');
var_dump(arguments($original));

$partial = userTarget(?);
echo "partial-created\n";
var_dump(arguments($original));
var_dump(arguments(new ReflectionFunction($partial)));

unset($partial);
gc_collect_cycles();
echo "partial-destroyed\n";
var_dump(arguments($original));

userTarget('discarded');

?>
--EXPECTF--
array(1) {
[0]=>
string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
}
partial-created
array(1) {
[0]=>
string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
}
array(1) {
[0]=>
string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
}
partial-destroyed
array(1) {
[0]=>
string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
}

Warning: The return value of function userTarget() should either be used or intentionally ignored by casting it as (void), message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d in %s on line %d
5 changes: 4 additions & 1 deletion Zend/zend_partial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,9 @@ static zend_ast *zp_attribute_to_ast(zend_attribute *attribute)
if (attribute->argc) {
args_ast = zend_ast_create_arg_list(0, ZEND_AST_ARG_LIST);
for (uint32_t i = 0; i < attribute->argc; i++) {
zend_ast *arg_ast = zend_ast_create_zval(&attribute->args[i].value);
zval *zv = &attribute->args[i].value;
Z_TRY_ADDREF_P(zv);
zend_ast *arg_ast = zend_ast_create_zval(zv);
if (attribute->args[i].name) {
arg_ast = zend_ast_create(ZEND_AST_NAMED_ARG,
zend_ast_create_zval_from_str(
Expand Down Expand Up @@ -561,6 +563,7 @@ static zend_ast *zp_compile_forwarding_call(
args_ast = zend_ast_list_add(args_ast, default_value_ast);
} else if (zp_is_const_arg(const_args, offset)) {
ZEND_ASSERT(Z_TYPE(argv[offset]) < IS_OBJECT);
ZEND_ASSERT(!Z_REFCOUNTED(argv[offset]));
args_ast = zend_ast_list_add(args_ast, zend_ast_create_zval(&argv[offset]));
} else {
args_ast = zend_ast_list_add(args_ast, zend_ast_create(ZEND_AST_VAR,
Expand Down
Loading