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.

Sign up for GitHub

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

Jump to bottom

Fix fuzzer-found frame stack corruption in rollback if instance storage fails #1173

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Fix fuzzer-found frame stack corruption in rollback if instance storage fails #1173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions soroban-env-host/src/host/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,6 @@ impl Host {
/// and storage map to the state in the provided [`RollbackPoint`].
pub(super) fn pop_frame(&self, orp: Option<RollbackPoint>) -> Result<(), HostError> {
let _span = tracy_span!("pop frame");
// Instance storage is tied to the frame and only exists in-memory. So
// instead of snapshotting it and rolling it back, we just flush the
// changes only when rollback is not needed.
if orp.is_none() {
self.persist_instance_storage()?;
}

if self.try_borrow_context_mut()?.pop().is_none() {
return Err(self.err(
Expand Down Expand Up @@ -358,7 +352,7 @@ impl Host {
}
let rp = self.push_frame(frame)?;
let res = f();
let res = if let Ok(v) = res {
let mut res = if let Ok(v) = res {
if let Ok(err) = Error::try_from(v) {
Err(self.error(err, "escalating Ok(Error) frame-exit to Err(Error)", &[]))
} else {
Expand All @@ -367,6 +361,17 @@ impl Host {
} else {
res
};

// We try flushing instance storage at the end of the frame if nothing
// else failed. Unfortunately flushing instance storage is _itself_
// fallible in a variety of ways, and if it fails we want to roll back
// everything else.
if res.is_ok() {
if let Err(e) = self.persist_instance_storage() {
res = Err(e)
}
}

if res.is_err() {
// Pop and rollback on error.
self.pop_frame(Some(rp))?;
Expand Down