diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs index 26bd551976d547..65cc88d753a149 100644 --- a/programs/bpf_loader/src/syscalls/mod.rs +++ b/programs/bpf_loader/src/syscalls/mod.rs @@ -26,8 +26,7 @@ use { enable_get_epoch_stake_syscall, enable_partitioned_epoch_reward, enable_poseidon_syscall, error_on_syscall_bpf_function_hash_collisions, get_sysvar_syscall_enabled, last_restart_slot_sysvar, partitioned_epoch_rewards_superfeature, - reenable_sbpf_v1_execution, reject_callx_r10, remaining_compute_units_syscall_enabled, - FeatureSet, + reenable_sbpf_v1_execution, remaining_compute_units_syscall_enabled, FeatureSet, }, solana_log_collector::{ic_logger_msg, ic_msg}, solana_poseidon as poseidon, @@ -300,7 +299,7 @@ pub fn create_program_runtime_environment_v1<'a>( sanitize_user_provided_values: true, external_internal_function_hash_collision: feature_set .is_active(&error_on_syscall_bpf_function_hash_collisions::id()), - reject_callx_r10: feature_set.is_active(&reject_callx_r10::id()), + reject_callx_r10: true, enable_sbpf_v1: !feature_set.is_active(&disable_sbpf_v1_execution::id()) || feature_set.is_active(&reenable_sbpf_v1_execution::id()), enable_sbpf_v2: false, diff --git a/svm/tests/mock_bank.rs b/svm/tests/mock_bank.rs index 5797d514888201..8adbd2a55bf13e 100644 --- a/svm/tests/mock_bank.rs +++ b/svm/tests/mock_bank.rs @@ -299,7 +299,7 @@ fn create_custom_environment<'a>() -> BuiltinProgram> { noop_instruction_rate: 256, sanitize_user_provided_values: true, external_internal_function_hash_collision: false, - reject_callx_r10: false, + reject_callx_r10: true, enable_sbpf_v1: true, enable_sbpf_v2: false, optimize_rodata: false,