From 0a5164d887b762bd8b1f463e359e912631d548b4 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Thu, 22 Dec 2022 19:07:08 +1100 Subject: [PATCH] Remove checks for activated feature check_physical_overlapping (#29355) --- programs/bpf_loader/src/syscalls/mem_ops.rs | 8 +------- programs/bpf_loader/src/syscalls/mod.rs | 8 ++++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/programs/bpf_loader/src/syscalls/mem_ops.rs b/programs/bpf_loader/src/syscalls/mem_ops.rs index 4ab4480a52b2e4..a424bdb0e1f849 100644 --- a/programs/bpf_loader/src/syscalls/mem_ops.rs +++ b/programs/bpf_loader/src/syscalls/mem_ops.rs @@ -22,10 +22,6 @@ declare_syscall!( ) -> Result { mem_op_consume(invoke_context, n)?; - let do_check_physical_overlapping = invoke_context - .feature_set - .is_active(&check_physical_overlapping::id()); - if !is_nonoverlapping(src_addr, n, dst_addr, n) { return Err(SyscallError::CopyOverlapping.into()); } @@ -46,9 +42,7 @@ declare_syscall!( invoke_context.get_check_size(), )? .as_ptr(); - if do_check_physical_overlapping - && !is_nonoverlapping(src_ptr as usize, n as usize, dst_ptr as usize, n as usize) - { + if !is_nonoverlapping(src_ptr as usize, n as usize, dst_ptr as usize, n as usize) { unsafe { std::ptr::copy(src_ptr, dst_ptr, n as usize); } diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs index a1b609ec6bed7d..6176fdbb6a83af 100644 --- a/programs/bpf_loader/src/syscalls/mod.rs +++ b/programs/bpf_loader/src/syscalls/mod.rs @@ -33,10 +33,10 @@ use { entrypoint::{BPF_ALIGN_OF_U128, MAX_PERMITTED_DATA_INCREASE, SUCCESS}, feature_set::FeatureSet, feature_set::{ - self, blake3_syscall_enabled, check_physical_overlapping, - check_syscall_outputs_do_not_overlap, curve25519_syscall_enabled, - disable_cpi_setting_executable_and_rent_epoch, disable_fees_sysvar, - enable_alt_bn128_syscall, enable_early_verification_of_account_modifications, + self, blake3_syscall_enabled, check_syscall_outputs_do_not_overlap, + curve25519_syscall_enabled, disable_cpi_setting_executable_and_rent_epoch, + disable_fees_sysvar, enable_alt_bn128_syscall, + enable_early_verification_of_account_modifications, error_on_syscall_bpf_function_hash_collisions, libsecp256k1_0_5_upgrade_enabled, limit_secp256k1_recovery_id, reject_callx_r10, stop_sibling_instruction_search_at_parent,