gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return an error from create_program_address syscall (bp #11658) (#11789)

Browse Source 
* Return an error from create_program_address syscall (#11658)

(cherry picked from commit 750e5344f1)

# Conflicts:
#	programs/bpf_loader/src/syscalls.rs

* resolve conflicts

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2020-08-24 04:30:29 +00:00
committed by GitHub
parent f5e583ef0d
commit 79a2ccabb4
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
programs/bpf/rust/invoke/src/lib.rs
View File

@ -12,7 +12,7 @@ use solana_sdk::{
info, info,
program::{invoke, invoke_signed}, program::{invoke, invoke_signed},
program_error::ProgramError, program_error::ProgramError,
pubkey::Pubkey, pubkey::{Pubkey, PubkeyError},
system_instruction, system_instruction,
}; };
@ -97,9 +97,15 @@ fn process_instruction(
info!("Test create_program_address"); info!("Test create_program_address");
{ {
let address = assert_eq!(
Pubkey::create_program_address(&[b"You pass butter", &[nonce1]], program_id)?; &Pubkey::create_program_address(&[b"You pass butter", &[nonce1]], program_id)?,
assert_eq!(&address, accounts[DERIVED_KEY1_INDEX].key); accounts[DERIVED_KEY1_INDEX].key
);
assert_eq!(
Pubkey::create_program_address(&[b"You pass butter"], &Pubkey::default())
.unwrap_err(),
PubkeyError::InvalidSeeds
);
} }
info!("Test derived signers"); info!("Test derived signers");

7
programs/bpf_loader/src/syscalls.rs
View File

@ -342,7 +342,7 @@ pub fn syscall_create_program_address(
ro_regions: &[MemoryRegion], ro_regions: &[MemoryRegion],
rw_regions: &[MemoryRegion], rw_regions: &[MemoryRegion],
) -> Result<u64, EbpfError<BPFError>> { ) -> Result<u64, EbpfError<BPFError>> {
let untranslated_seeds = translate_slice!(&[&str], seeds_addr, seeds_len, ro_regions)?; let untranslated_seeds = translate_slice!(&[&u8], seeds_addr, seeds_len, ro_regions)?;
let seeds = untranslated_seeds let seeds = untranslated_seeds
.iter() .iter()
.map(|untranslated_seed| { .map(|untranslated_seed| {
@ -356,7 +356,10 @@ pub fn syscall_create_program_address(
.collect::<Result<Vec<_>, EbpfError<BPFError>>>()?; .collect::<Result<Vec<_>, EbpfError<BPFError>>>()?;
let program_id = translate_type!(Pubkey, program_id_addr, ro_regions)?; let program_id = translate_type!(Pubkey, program_id_addr, ro_regions)?;
let new_address = let new_address =
Pubkey::create_program_address(&seeds, program_id).map_err(SyscallError::BadSeeds)?; match Pubkey::create_program_address(&seeds, program_id).map_err(SyscallError::BadSeeds) {
Ok(address) => address,
Err(_) => return Ok(1),
};
let address = translate_slice_mut!(u8, address_addr, 32, rw_regions)?; let address = translate_slice_mut!(u8, address_addr, 32, rw_regions)?;
address.copy_from_slice(new_address.as_ref()); address.copy_from_slice(new_address.as_ref());
Ok(0) Ok(0)