Skip to content

Update preview1 to trap on misaligned pointers #6776

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

Merged
pchickey merged 4 commits into from
Aug 2, 2023
Merged

Update preview1 to trap on misaligned pointers #6776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39b8cf1
Update preview1 to trap on misaligned pointers
alexcrichton Jul 26, 2023
ad784d3
Change OOB errors to traps too
alexcrichton Aug 2, 2023
7e6e862
Update preview2's implementation of preview1
alexcrichton Aug 2, 2023
6d22754
Handle some more errors
alexcrichton Aug 2, 2023
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
16 changes: 13 additions & 3 deletions crates/wasi-common/src/snapshots/preview_1/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,19 @@ impl From<wiggle::GuestError> for Error {
match err {
InvalidFlagValue { .. } => Errno::Inval.into(),
InvalidEnumValue { .. } => Errno::Inval.into(),
PtrOverflow { .. } => Errno::Fault.into(),
PtrOutOfBounds { .. } => Errno::Fault.into(),
PtrNotAligned { .. } => Errno::Inval.into(),
// As per
// https://github.com/WebAssembly/wasi/blob/main/legacy/tools/witx-docs.md#pointers
//
// > If a misaligned pointer is passed to a function, the function
// > shall trap.
// >
// > If an out-of-bounds pointer is passed to a function and the
// > function needs to dereference it, the function shall trap.
//
// so this turns OOB and misalignment errors into traps.
PtrOverflow { .. } | PtrOutOfBounds { .. } | PtrNotAligned { .. } => {
Error::trap(err.into())
}
PtrBorrowed { .. } => Errno::Fault.into(),
InvalidUtf8 { .. } => Errno::Ilseq.into(),
TryFromIntError { .. } => Errno::Overflow.into(),
Expand Down
Loading