Prevent race condition in opcache_reset()

dstogov · dstogov · commit a8a019d68a60 · 2019-05-21T00:07:17.000+03:00
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -768,7 +768,10 @@ static ZEND_FUNCTION(opcache_reset)
 		RETURN_FALSE;
 	}
 
+	/* exclusive lock */
+	zend_shared_alloc_lock();
 	zend_accel_schedule_restart(ACCEL_RESTART_USER);
+	zend_shared_alloc_unlock();
 	RETURN_TRUE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,10 @@ static ZEND_FUNCTION(opcache_reset)`
`768`	`768`	`RETURN_FALSE;`
`769`	`769`	`}`
`770`	`770`
	`771`	`+ /* exclusive lock */`
	`772`	`+ zend_shared_alloc_lock();`
`771`	`773`	`zend_accel_schedule_restart(ACCEL_RESTART_USER);`
	`774`	`+ zend_shared_alloc_unlock();`
`772`	`775`	`RETURN_TRUE;`
`773`	`776`	`}`
`774`	`777`