[core] check for excessive secp256r1 signature verification in the ba…

…nking stage (#3938)
anza-xyz · Dec 6, 2024 · 18564ab · 18564ab
1 parent ce4a52d
commit 18564ab
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -77,6 +77,7 @@ solana-runtime = { workspace = true }
 solana-runtime-transaction = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
+solana-sdk-ids = { workspace = true }
 solana-send-transaction-service = { workspace = true }
 solana-short-vec = { workspace = true }
 solana-streamer = { workspace = true }

diff --git a/core/src/banking_stage/packet_filter.rs b/core/src/banking_stage/packet_filter.rs
@@ -5,6 +5,7 @@ use {
     solana_sdk::{
         ed25519_program, feature_set::FeatureSet, saturating_add_assign, secp256k1_program,
     },
+    solana_sdk_ids::secp256r1_program,
     thiserror::Error,
 };
 
@@ -48,7 +49,10 @@ impl ImmutableDeserializedPacket {
     pub fn check_excessive_precompiles(&self) -> Result<(), PacketFilterFailure> {
         let mut num_precompile_signatures: u64 = 0;
         for (program_id, ix) in self.transaction().get_message().program_instructions_iter() {
-            if secp256k1_program::check_id(program_id) || ed25519_program::check_id(program_id) {
+            if secp256k1_program::check_id(program_id)
+                || ed25519_program::check_id(program_id)
+                || secp256r1_program::check_id(program_id)
+            {
                 let num_signatures = ix.data.first().map_or(0, |byte| u64::from(*byte));
                 saturating_add_assign!(num_precompile_signatures, num_signatures);
             }

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock