Skip to content

Commit

Permalink
Fix soundness hole in the public API
Browse files Browse the repository at this point in the history
Closes near#24
  • Loading branch information
matklad committed Mar 19, 2021
1 parent 735686d commit 4be93bf
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 27 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## vNext

- *BREAKING CHANGE*: `is_u8` method is removed from the public API.
Consumers of the API don't need to call or override it, and doing
so might cause undefined behavior.

## 0.9.0
- *BREAKING CHANGE*: `is_u8` optimization helper is now unsafe since it may
cause undefined behavior if it returns `true` for the type that is not safe
Expand Down Expand Up @@ -28,4 +34,3 @@
- Added support for `std::borrow::Cow`
- Avoid silent integer casts since they can lead to hidden security issues.
- Removed `Cargo.lock` as it is advised for lib crates.

48 changes: 35 additions & 13 deletions borsh/src/de/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,41 @@ pub trait BorshDeserialize: Sized {
Ok(result)
}

/// Whether Self is u8.
/// NOTE: `Vec<u8>` is the most common use-case for serialization and deserialization, it's
/// worth handling it as a special case to improve performance.
/// It's a workaround for specific `Vec<u8>` implementation versus generic `Vec<T>`
/// implementation. See https://github.com/rust-lang/rfcs/pull/1210 for details.
///
/// It's marked unsafe, because if the type is not `u8` it leads to UB. See related issues:
/// - https://github.com/near/borsh-rs/issues/17
/// - https://github.com/near/borsh-rs/issues/18
/// Hidden private implementation detail, overriding this method is unsound.
// NOTE: `Vec<u8>` is the most common use-case for serialization and deserialization,
// it's worth handling it as a special case to improve performance. To do this properly,
// we need [specialization](https://github.com/rust-lang/rfcs/pull/1210), which is not
// currently available.
//
// As a work-around, we specialize manually. We need to ask a generic `T` if it is,
// in fact, an `u8`. We rely on the answer being correct for soundness, so overriding
// this method is unsafe. Ideally, we'd have an unsafe trait like
//
// ```
// unsafe trait IsU8 { const YES: bool = false; }
// ```
//
// Alas, that also needs specialization. So we just hide the method from crate's public
// API altogether.
//
// See https://github.com/near/borsh-rs/issues/24.
#[inline]
unsafe fn is_u8() -> bool {
#[doc(hidden)]
fn __dont_override_me_is_u8() -> bool {
false
}
}

#[inline]
fn is_u8<T: BorshDeserialize>() -> bool {
let res = T::__dont_override_me_is_u8();
debug_assert!(
!res || size_of::<T>() == size_of::<u8>(),
"Do not override `__dont_override_me_is_u8`, it is unsound"
);
res
}

impl BorshDeserialize for u8 {
#[inline]
fn deserialize(buf: &mut &[u8]) -> Result<Self> {
Expand All @@ -66,7 +86,9 @@ impl BorshDeserialize for u8 {
}

#[inline]
unsafe fn is_u8() -> bool {
fn __dont_override_me_is_u8() -> bool {
// SAFETY: this is technically an `unsafe { }` block,
// see the comment on the trait method for details.
true
}
}
Expand Down Expand Up @@ -246,7 +268,7 @@ where
let len = u32::deserialize(buf)?;
if len == 0 {
Ok(Vec::new())
} else if unsafe { T::is_u8() } && size_of::<T>() == size_of::<u8>() {
} else if is_u8::<T>() {
let len = len.try_into().map_err(|_| ErrorKind::InvalidInput)?;
if buf.len() < len {
return Err(Error::new(
Expand Down Expand Up @@ -493,7 +515,7 @@ macro_rules! impl_arrays {
#[inline]
fn deserialize(buf: &mut &[u8]) -> Result<Self> {
let mut result = [T::default(); $len];
if unsafe { T::is_u8() } && size_of::<T>() == size_of::<u8>() {
if is_u8::<T>() {
if buf.len() < $len {
return Err(Error::new(
ErrorKind::InvalidInput,
Expand Down
49 changes: 36 additions & 13 deletions borsh/src/ser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,52 @@ pub trait BorshSerialize {
Ok(result)
}

/// Whether Self is u8.
/// NOTE: `Vec<u8>` is the most common use-case for serialization and deserialization, it's
/// worth handling it as a special case to improve performance.
/// It's a workaround for specific `Vec<u8>` implementation versus generic `Vec<T>`
/// implementation. See https://github.com/rust-lang/rfcs/pull/1210 for details.
///
/// It's marked unsafe, because if the type is not `u8` it leads to UB. See related issues:
/// - https://github.com/near/borsh-rs/issues/17
/// - https://github.com/near/borsh-rs/issues/18
/// Hidden private implementation detail, overriding this method is unsound.
// NOTE: `Vec<u8>` is the most common use-case for serialization and deserialization,
// it's worth handling it as a special case to improve performance. To do this properly,
// we need [specialization](https://github.com/rust-lang/rfcs/pull/1210), which is not
// currently available.
//
// As a work-around, we specialize manually. We need to ask a generic `T` if it is,
// in fact, an `u8`. We rely on the answer being correct for soundness, so overriding
// this method is unsafe. Ideally, we'd have an unsafe trait like
//
// ```
// unsafe trait IsU8 { const YES: bool = false; }
// ```
//
// Alas, that also needs specialization. So we just hide the method from crate's public
// API altogether.
//
// See https://github.com/near/borsh-rs/issues/24.
#[inline]
unsafe fn is_u8() -> bool {
#[doc(hidden)]
fn __dont_override_me_is_u8() -> bool {
false
}
}

#[inline]
fn is_u8<T: BorshSerialize>() -> bool {
let res = T::__dont_override_me_is_u8();
debug_assert!(
// Can't check `TypeId`, as that requires `: 'static`
!res || size_of::<T>() == size_of::<u8>(),
"Do not override `__dont_override_me_is_u8`, it is unsound"
);
res
}

impl BorshSerialize for u8 {
#[inline]
fn serialize<W: Write>(&self, writer: &mut W) -> Result<()> {
writer.write_all(core::slice::from_ref(self))
}

#[inline]
unsafe fn is_u8() -> bool {
fn __dont_override_me_is_u8() -> bool {
// SAFETY: this is technically an `unsafe { }` block,
// see the comment on the trait method for details.
true
}
}
Expand Down Expand Up @@ -159,7 +182,7 @@ impl BorshSerialize for String {
/// Helper method that is used to serialize a slice of data (without the length marker).
#[inline]
fn serialize_slice<T: BorshSerialize, W: Write>(data: &[T], writer: &mut W) -> Result<()> {
if unsafe { T::is_u8() } && size_of::<T>() == size_of::<u8>() {
if is_u8::<T>() {
// The code below uses unsafe memory representation from `&[T]` to `&[u8]`.
// The size of the memory should match because `size_of::<T>() == size_of::<u8>()`.
//
Expand Down Expand Up @@ -408,7 +431,7 @@ macro_rules! impl_arrays {
{
#[inline]
fn serialize<W: Write>(&self, writer: &mut W) -> Result<()> {
if unsafe { T::is_u8() } && size_of::<T>() == size_of::<u8>() {
if is_u8::<T>() {
// The code below uses unsafe memory representation from `&[T]` to `&[u8]`.
// The size of the memory should match because `size_of::<T>() == size_of::<u8>()`.
//
Expand Down

0 comments on commit 4be93bf

Please sign in to comment.