archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix fuzzer support after CALL VM changes (#18491)

Browse source
This commit is contained in:
Niels Dossche 2025-05-04 13:25:42 +02:00 • committed by GitHub
parent 4e23d3d49f
commit 4152ca5c8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sapi/fuzzer/fuzzer-execute-common.h
View file

@ -27,12 +27,14 @@
#define FILE_NAME "/tmp/fuzzer.php" #define FILE_NAME "/tmp/fuzzer.php"
#define MAX_STEPS 1000 #define MAX_STEPS 1000
#define MAX_SIZE (8 * 1024) #define MAX_SIZE (8 * 1024)
#define ZEND_VM_ENTER_BIT 1ULL
static uint32_t steps_left; static uint32_t steps_left;
static bool bailed_out = false; static bool bailed_out = false;
/* Because the fuzzer is always compiled with clang, /* Because the fuzzer is always compiled with clang,
* we can assume that we don't use global registers / hybrid VM. */ * we can assume that we don't use global registers / hybrid VM. */
typedef int (ZEND_FASTCALL *opcode_handler_t)(zend_execute_data *); typedef zend_op *(ZEND_FASTCALL *opcode_handler_t)(zend_execute_data *, const zend_op *);
static zend_always_inline void fuzzer_bailout(void) { static zend_always_inline void fuzzer_bailout(void) {
bailed_out = true; bailed_out = true;
@ -51,11 +53,13 @@ static zend_always_inline void fuzzer_step(void) {
static void (*orig_execute_ex)(zend_execute_data *execute_data); static void (*orig_execute_ex)(zend_execute_data *execute_data);
static void fuzzer_execute_ex(zend_execute_data *execute_data) { static void fuzzer_execute_ex(zend_execute_data *execute_data) {
const zend_op *opline = EX(opline);
while (1) { while (1) {
int ret;
fuzzer_step(); fuzzer_step();
if ((ret = ((opcode_handler_t) EX(opline)->handler)(execute_data)) != 0) { opline = ((opcode_handler_t) opline->handler)(execute_data, opline);
if (ret > 0) { if ((uintptr_t) opline & ZEND_VM_ENTER_BIT) {
opline = (const zend_op *) ((uintptr_t) opline & ~ZEND_VM_ENTER_BIT);
if (opline) {
execute_data = EG(current_execute_data); execute_data = EG(current_execute_data);
} else { } else {
return; return;