flamenco, vm: correctly set check_align in vm #2831
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
topointon-jump
force-pushed
the
topointon/check_align_check_size
branch
2 times, most recently
from
2addabf
to
6c6c7a4
Compare
topointon-jump
force-pushed
the
topointon/check_align_check_size
branch
from
40fb06d
to
b2e0f53
Compare
ibhatt-jumptrading
approved these changes
Sep 17, 2024
0x0ece
approved these changes
Sep 17, 2024
| @@ -171,8 +171,7 @@ VM_SYCALL_CPI_UPDATE_CALLEE_ACC_FUNC( fd_vm_t * vm, | |||
| /* FIXME: double-check these permissions, especially the callee_acc_idx */ | |||
|
|
|||
| /* Translate and get the account data */ | |||
| uchar const * caller_acc_data = FD_VM_MEM_HADDR_LD( vm, caller_acc_data_vm_addr, | |||
| sizeof(ulong), caller_acc_data_len ); | |||
| uchar const * caller_acc_data = FD_VM_MEM_HADDR_LD( vm, caller_acc_data_vm_addr, sizeof(uchar), caller_acc_data_len ); | |||
There was a problem hiding this comment.
align of, or better RUST_U8
| @@ -237,7 +236,7 @@ VM_SYCALL_CPI_UPDATE_CALLEE_ACC_FUNC( fd_vm_t * vm, | |||
| smartly look up the right region and don't need to worry about | |||
| multiple region access.We just need to load in the bytes from | |||
| (original len, post_len]. */ | |||
| uchar const * realloc_data = FD_VM_MEM_HADDR_LD( vm, caller_acc_data_vm_addr+original_len, alignof(ulong), realloc_bytes_used ); | |||
| uchar const * realloc_data = FD_VM_MEM_HADDR_LD( vm, caller_acc_data_vm_addr+original_len, alignof(uchar), realloc_bytes_used ); | |||
| @@ -124,8 +124,8 @@ fd_vm_syscall_sol_create_program_address( /**/ void * _vm, | |||
| return FD_VM_SUCCESS; | |||
| } | |||
|
|
|||
| fd_pubkey_t * out_haddr = FD_VM_MEM_HADDR_ST( vm, out_vaddr, FD_VM_ALIGN_RUST_PUBKEY, sizeof(fd_pubkey_t) ); | |||
| memcpy( out_haddr, derived->uc, sizeof(fd_pubkey_t) ); | |||
| fd_pubkey_t * out_haddr = FD_VM_MEM_HADDR_ST( vm, out_vaddr, FD_VM_ALIGN_RUST_U8, FD_PUBKEY_FOOTPRINT ); | |||
| @@ -174,7 +174,7 @@ fd_vm_syscall_sol_try_find_program_address( void * _vm, | |||
| int err = fd_vm_derive_pda( vm, program_id, seeds_vaddr, seeds_cnt, bump_seed, derived ); | |||
| if ( FD_LIKELY( err == FD_VM_SUCCESS ) ) { | |||
| /* Stop looking if we have found a valid PDA */ | |||
| fd_pubkey_t * out_haddr = FD_VM_MEM_HADDR_ST( vm, out_vaddr, FD_VM_ALIGN_RUST_PUBKEY, sizeof(fd_pubkey_t) ); | |||
| fd_pubkey_t * out_haddr = FD_VM_MEM_HADDR_ST( vm, out_vaddr, FD_VM_ALIGN_RUST_U8, sizeof(fd_pubkey_t) ); | |||
There was a problem hiding this comment.
FD_VM_ALIGN_RUST_PUBKEY, FD_PUBKEY_FOOTPRINT
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Correctly set
check_alignin the vm based on if the deprecated loader is used.Also correctly sets alignment values for all the memory address translations in the vm.