Gate pointer alignment enforcement (#12176)

solana-labs · Sep 11, 2020 · ae7b15f · ae7b15f
1 parent de4a613
commit ae7b15f
Show file tree

Hide file tree

Showing 4 changed files with 228 additions and 101 deletions.
diff --git a/programs/bpf/benches/bpf_loader.rs b/programs/bpf/benches/bpf_loader.rs
@@ -15,7 +15,7 @@ use solana_runtime::{
     loader_utils::load_program,
 };
 use solana_sdk::{
-    account::{create_keyed_readonly_accounts, Account, KeyedAccount},
+    account::{create_keyed_readonly_accounts, Account},
     bpf_loader, bpf_loader_deprecated,
     client::SyncClient,
     entrypoint::SUCCESS,
@@ -92,12 +92,12 @@ fn bench_program_alu(bencher: &mut Bencher) {
         .write_u64::<LittleEndian>(ARMSTRONG_LIMIT)
         .unwrap();
     inner_iter.write_u64::<LittleEndian>(0).unwrap();
+    let loader_id = bpf_loader::id();
     let mut invoke_context = MockInvokeContext::default();
 
     let elf = load_elf("bench_alu").unwrap();
     let (mut vm, _) =
-        solana_bpf_loader_program::create_vm(&bpf_loader::id(), &elf, &[], &mut invoke_context)
-            .unwrap();
+        solana_bpf_loader_program::create_vm(&loader_id, &elf, &[], &mut invoke_context).unwrap();
 
     println!("Interpreted:");
     assert_eq!(

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
@@ -70,9 +70,10 @@ fn run_program(
     let mut program_account = Account::default();
     file.read_to_end(&mut program_account.data).unwrap();
 
+    let loader_id = bpf_loader::id();
     let mut invoke_context = MockInvokeContext::default();
     let (mut vm, heap_region) = create_vm(
-        &bpf_loader::id(),
+        &loader_id,
         &program_account.data,
         parameter_accounts,
         &mut invoke_context,

diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
@@ -60,7 +60,7 @@ pub enum BPFError {
 impl UserDefinedError for BPFError {}
 
 pub fn create_vm<'a>(
-    loader_id: &Pubkey,
+    loader_id: &'a Pubkey,
     prog: &'a [u8],
     parameter_accounts: &'a [KeyedAccount<'a>],
     invoke_context: &'a mut dyn InvokeContext,