Skip to content

Commit

Permalink
Fix undefined behavior in Rc/Arc allocation
Browse files Browse the repository at this point in the history
Manually calculate allocation layout for `Rc`/`Arc` to avoid undefined behavior
  • Loading branch information
murarth committed Nov 5, 2018
1 parent 423d810 commit d60290f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
12 changes: 7 additions & 5 deletions src/liballoc/rc.rs
Expand Up @@ -665,15 +665,17 @@ impl Rc<dyn Any> {
impl<T: ?Sized> Rc<T> {
// Allocates an `RcBox<T>` with sufficient space for an unsized value
unsafe fn allocate_for_ptr(ptr: *const T) -> *mut RcBox<T> {
// Create a fake RcBox to find allocation size and alignment
let fake_ptr = ptr as *mut RcBox<T>;

let layout = Layout::for_value(&*fake_ptr);
// Calculate layout using the given value.
// Previously, layout was calculated on the expression
// `&*(ptr as *const RcBox<T>)`, but this created a misaligned
// reference (see #54908).
let (layout, _) = Layout::new::<RcBox<()>>()
.extend(Layout::for_value(&*ptr)).unwrap();

let mem = Global.alloc(layout)
.unwrap_or_else(|_| handle_alloc_error(layout));

// Initialize the real RcBox
// Initialize the RcBox
let inner = set_data_ptr(ptr as *mut T, mem.as_ptr() as *mut u8) as *mut RcBox<T>;

ptr::write(&mut (*inner).strong, Cell::new(1));
Expand Down
12 changes: 7 additions & 5 deletions src/liballoc/sync.rs
Expand Up @@ -566,15 +566,17 @@ impl<T: ?Sized> Arc<T> {
impl<T: ?Sized> Arc<T> {
// Allocates an `ArcInner<T>` with sufficient space for an unsized value
unsafe fn allocate_for_ptr(ptr: *const T) -> *mut ArcInner<T> {
// Create a fake ArcInner to find allocation size and alignment
let fake_ptr = ptr as *mut ArcInner<T>;

let layout = Layout::for_value(&*fake_ptr);
// Calculate layout using the given value.
// Previously, layout was calculated on the expression
// `&*(ptr as *const ArcInner<T>)`, but this created a misaligned
// reference (see #54908).
let (layout, _) = Layout::new::<ArcInner<()>>()
.extend(Layout::for_value(&*ptr)).unwrap();

let mem = Global.alloc(layout)
.unwrap_or_else(|_| handle_alloc_error(layout));

// Initialize the real ArcInner
// Initialize the ArcInner
let inner = set_data_ptr(ptr as *mut T, mem.as_ptr() as *mut u8) as *mut ArcInner<T>;

ptr::write(&mut (*inner).strong, atomic::AtomicUsize::new(1));
Expand Down

0 comments on commit d60290f

Please sign in to comment.