blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove checks for activated feature check_physical_overlapping (#29355)

This commit is contained in:
Alessandro Decina 2022-12-22 19:07:08 +11:00 committed by GitHub
parent d8da242e5e
commit 0a5164d887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/bpf_loader/src/syscalls/mem_ops.rs
View File

@ -22,10 +22,6 @@ declare_syscall!(
) -> Result<u64, EbpfError> {
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);
}

8
programs/bpf_loader/src/syscalls/mod.rs
View File

@ -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,