Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: cpi: direct_mapping: always zero spare capacity if account alloc changes (backport of #34141) #34177

Merged
merged 1 commit into from
Nov 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2023

This is an automatic backport of pull request #34141 done by Mergify.
Cherry-pick of d9147d7 has failed:

On branch mergify/bp/v1.17/pr-34141
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit d9147d7a77.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   programs/sbf/rust/invoke/src/processor.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/syscalls/cpi.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ges (#34141)

If the vector holding an account is reallocated during execution of a callee,
we must zero the spare capacity regardless of whether the account size changed,
because the underlying vector might contain uninitialized memory in the spare
capacity.
@alessandrod alessandrod force-pushed the mergify/bp/v1.17/pr-34141 branch from c4cc81d to 391a6ce Compare November 28, 2023 21:50
Copy link

codecov bot commented Nov 28, 2023

Codecov Report

Merging #34177 (391a6ce) into v1.17 (67bfb48) will decrease coverage by 0.1%.
The diff coverage is 84.3%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34177     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         803      803             
  Lines      218020   218020             
=========================================
- Hits       178479   178463     -16     
- Misses      39541    39557     +16     

@alessandrod alessandrod merged commit 4d0ccab into v1.17 Nov 28, 2023
16 checks passed
@alessandrod alessandrod deleted the mergify/bp/v1.17/pr-34141 branch November 28, 2023 23:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants