fix(lang): validate program_id in CPI Return<T>::get()#4411
Merged
jamie-osec merged 6 commits intoApr 16, 2026
Conversation
|
@jamie-osec is attempting to deploy a commit to the Solana Foundation Team on Vercel. A member of the Team first needs to authorize it. |
Collaborator
|
the pr lgtm, would be good to have a changelog aswell! Also please address failed CI |
Return<T>::get() calls get_return_data() which returns (program_id, data), but the program_id was discarded via `let (_key, data) = ...` without validation. This allows return data spoofing if another program calls set_return_data() between the CPI and the get() call. The fix stores the expected program_id (from CpiContext) in the Return<T> struct and validates it in get(). A new get_unchecked() method preserves the old behavior for cases where cross-program return data is intentional. Applied to both codegen paths: - lang/syn/src/codegen/program/cpi.rs (standard #[program]) - lang/attribute/program/src/declare_program/mods/cpi.rs (declare_program!) Includes PoC test demonstrating the spoofing attack with 3 programs (caller, callee, malicious) in tests/cpi-returns/.
jamie-osec
force-pushed
the
fix/cpi-return-validate-program-id
branch
from
43018fb to
9728979
Compare
jamie-osec
force-pushed
the
fix/cpi-return-validate-program-id
branch
from
9728979 to
4cc63cd
Compare
0x4ka5h
approved these changes
Apr 16, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Based on #4231 but with some small tweaks
Closes #4232
Thanks for the PR @rz1989s!