Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix - Adds missing "Executable account not owned by the BPF loader" error to remove_bpf_loader_incorrect_program_id #32695

Conversation

Lichtso
Copy link
Contributor

@Lichtso Lichtso commented Aug 2, 2023

Problem

#30748 is missing this check from v1.14:

        if program.is_executable() && !check_loader_id(program.get_owner()) {
            ic_logger_msg!(
                log_collector,
                "Executable account not owned by the BPF loader"
            );
            return Err(InstructionError::IncorrectProgramId);
        }

Summary of Changes

Adds the missing error condition to the feature gated code.

Feature Gate Issue: #30747

@Lichtso Lichtso added bug Something isn't working feature-gate Pull Request adds or modifies a runtime feature gate v1.16 PRs that should be backported to v1.16 labels Aug 2, 2023
@Lichtso Lichtso requested a review from pgarg66 August 2, 2023 20:53
@codecov
Copy link

codecov bot commented Aug 2, 2023

Codecov Report

Merging #32695 (9755ed4) into master (1552a07) will decrease coverage by 0.1%.
Report is 2 commits behind head on master.
The diff coverage is 42.8%.

@@            Coverage Diff            @@
##           master   #32695     +/-   ##
=========================================
- Coverage    82.0%    82.0%   -0.1%     
=========================================
  Files         785      785             
  Lines      211073   211081      +8     
=========================================
- Hits       173167   173152     -15     
- Misses      37906    37929     +23     

@Lichtso Lichtso merged commit b5a80a7 into solana-labs:master Aug 3, 2023
@Lichtso Lichtso deleted the fix/remove_bpf_loader_incorrect_program_id branch August 3, 2023 13:26
mergify bot pushed a commit that referenced this pull request Aug 3, 2023
…rror to `remove_bpf_loader_incorrect_program_id` (#32695)

Adds missing "Executable account not owned by the BPF loader" error.

(cherry picked from commit b5a80a7)
Lichtso added a commit that referenced this pull request Aug 3, 2023
…ader" error to `remove_bpf_loader_incorrect_program_id` (backport of #32695) (#32700)

Fix - Adds missing "Executable account not owned by the BPF loader" error to `remove_bpf_loader_incorrect_program_id` (#32695)

Adds missing "Executable account not owned by the BPF loader" error.

(cherry picked from commit b5a80a7)

Co-authored-by: Alexander Meißner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working feature-gate Pull Request adds or modifies a runtime feature gate v1.16 PRs that should be backported to v1.16
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants