Adds the feature disable_bpf_loader_instructions.

solana-labs · Feb 6, 2024 · 873d339 · 873d339
1 parent a4621d8
commit 873d339
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
@@ -36,9 +36,10 @@ use {
         feature_set::{
             bpf_account_data_direct_mapping, cap_accounts_data_allocations_per_transaction,
             cap_bpf_program_instruction_accounts, delay_visibility_of_program_deployment,
-            enable_bpf_loader_extend_program_ix, enable_bpf_loader_set_authority_checked_ix,
-            enable_program_redeployment_cooldown, limit_max_instruction_trace_length,
-            native_programs_consume_cu, remove_bpf_loader_incorrect_program_id,
+            disable_bpf_loader_instructions, enable_bpf_loader_extend_program_ix,
+            enable_bpf_loader_set_authority_checked_ix, enable_program_redeployment_cooldown,
+            limit_max_instruction_trace_length, native_programs_consume_cu,
+            remove_bpf_loader_incorrect_program_id,
         },
         instruction::{AccountMeta, InstructionError},
         loader_instruction::LoaderInstruction,
@@ -509,7 +510,20 @@ pub fn process_instruction_inner(
             if native_programs_consume_cu {
                 invoke_context.consume_checked(DEFAULT_LOADER_COMPUTE_UNITS)?;
             }
-            process_loader_instruction(invoke_context)
+            // Return `UnsupportedProgramId` error for bpf_loader when
+            // `disable_bpf_loader_instruction` feature is activated.
+            if invoke_context
+                .feature_set
+                .is_active(&disable_bpf_loader_instructions::id())
+            {
+                ic_logger_msg!(
+                    log_collector,
+                    "BPF loader management instructions are no longer supported"
+                );
+                Err(InstructionError::UnsupportedProgramId)
+            } else {
+                process_loader_instruction(invoke_context)
+            }
         } else if bpf_loader_deprecated::check_id(program_id) {
             if native_programs_consume_cu {
                 invoke_context.consume_checked(DEPRECATED_LOADER_COMPUTE_UNITS)?;

diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
@@ -744,6 +744,10 @@ pub mod index_erasure_conflict_duplicate_proofs {
     solana_sdk::declare_id!("dupPajaLy2SSn8ko42aZz4mHANDNrLe8Nw8VQgFecLa");
 }
 
+pub mod disable_bpf_loader_instructions {
+    solana_sdk::declare_id!("7WeS1vfPRgeeoXArLh7879YcB9mgE9ktjPDtajXeWfXn");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -925,6 +929,7 @@ lazy_static! {
         (consume_blockstore_duplicate_proofs::id(), "consume duplicate proofs from blockstore in consensus #34372"),
         (index_erasure_conflict_duplicate_proofs::id(), "generate duplicate proofs for index and erasure conflicts #34360"),
         (curve25519_restrict_msm_length::id(), "restrict curve25519 multiscalar multiplication vector lengths #34763"),
+        (disable_bpf_loader_instructions::id(), "disable bpf loader management instructions #34194"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()