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

fix bpf lddw check (#13554)

Browse Source
This commit is contained in:
Jack May
2020-11-12 13:13:42 -08:00
committed by GitHub
parent 4e4e12b384
commit 30ef53cb13
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bpf_loader/src/bpf_verifier.rs
View File

@ -83,7 +83,7 @@ fn check_imm_endian(insn: &ebpf::Insn, insn_ptr: usize) -> Result<(), BPFError>
} }
fn check_load_dw(prog: &[u8], insn_ptr: usize) -> Result<(), BPFError> { fn check_load_dw(prog: &[u8], insn_ptr: usize) -> Result<(), BPFError> {
if insn_ptr >= (prog.len() / ebpf::INSN_SIZE) { if insn_ptr + 1 >= (prog.len() / ebpf::INSN_SIZE) {
// Last instruction cannot be LD_DW because there would be no 2nd DW // Last instruction cannot be LD_DW because there would be no 2nd DW
return Err(VerifierError::LDDWCannotBeLast.into()); return Err(VerifierError::LDDWCannotBeLast.into());
} }

9
programs/bpf_loader/src/lib.rs
View File

@ -370,6 +370,15 @@ mod tests {
.unwrap(); .unwrap();
} }
#[test]
#[should_panic(expected = "VerifierError(LDDWCannotBeLast)")]
fn test_bpf_loader_check_load_dw() {
let prog = &[
0x18, 0x00, 0x00, 0x00, 0x88, 0x77, 0x66, 0x55, // first half of lddw
];
bpf_verifier::check(prog, true).unwrap();
}
#[test] #[test]
fn test_bpf_loader_write() { fn test_bpf_loader_write() {
let program_id = solana_sdk::pubkey::new_rand(); let program_id = solana_sdk::pubkey::new_rand();