Skip to content

Fix integer overflow panics on guest-derived usize arithmetic (#3) #678

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

Draft
CvvT wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix integer overflow panics on guest-derived usize arithmetic (#3) #678

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion litebox_shim_linux/src/syscalls/mm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::Task;
#[inline]
fn align_up(addr: usize, align: usize) -> usize {
debug_assert!(align.is_power_of_two());
(addr + align - 1) & !(align - 1)
addr.wrapping_add(align - 1) & !(align - 1)
}

#[expect(
Expand Down
10 changes: 6 additions & 4 deletions litebox_shim_linux/src/syscalls/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,14 +468,14 @@ fn wake_robust_list(
let (mut entry, mut pi) = fetch_robust_entry(crate::ConstPtr::from_usize(head.list.next));
let (pending, ppi) = fetch_robust_entry(crate::ConstPtr::from_usize(head.list_op_pending));
let futex_offset = head.futex_offset;
let entry_head = head_ptr + offset_of!(litebox_common_linux::RobustListHead, list);
let entry_head = head_ptr.wrapping_add(offset_of!(litebox_common_linux::RobustListHead, list));
while entry.as_usize() != entry_head && limit > 0 {
let nxt = entry
.read_at_offset(0)
.map(|e| fetch_robust_entry(crate::ConstPtr::from_usize(e.next)));
if entry.as_usize() != pending.as_usize() {
handle_futex_death(
crate::ConstPtr::from_usize(entry.as_usize() + futex_offset),
crate::ConstPtr::from_usize(entry.as_usize().wrapping_add(futex_offset)),
pi,
false,
)?;
Expand All @@ -491,7 +491,7 @@ fn wake_robust_list(

if pending.as_usize() != 0 {
let _ = handle_futex_death(
crate::ConstPtr::from_usize(pending.as_usize() + futex_offset),
crate::ConstPtr::from_usize(pending.as_usize().wrapping_add(futex_offset)),
ppi,
true,
);
Expand Down Expand Up @@ -1311,7 +1311,9 @@ impl<FS: ShimFS> Task<FS> {
}
out.push(cs);
// advance to next pointer
base = crate::ConstPtr::from_usize(base.as_usize() + core::mem::size_of::<usize>());
base = crate::ConstPtr::from_usize(
base.as_usize().wrapping_add(core::mem::size_of::<usize>()),
);
}
Ok(out)
}
Expand Down
8 changes: 4 additions & 4 deletions litebox_shim_optee/src/syscalls/ldelf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ impl Task {
let total_size = num_bytes
.checked_add(pad_begin)
.and_then(|t| t.checked_add(pad_end))
.ok_or(TeeResult::BadParameters)?
.next_multiple_of(PAGE_SIZE);
.and_then(|t| t.checked_next_multiple_of(PAGE_SIZE))
.ok_or(TeeResult::BadParameters)?;
if addr.checked_add(total_size).is_none() {
return Err(TeeResult::BadParameters);
}
Expand Down Expand Up @@ -178,8 +178,8 @@ impl Task {
let total_size = num_bytes
.checked_add(pad_begin)
.and_then(|t| t.checked_add(pad_end))
.ok_or(TeeResult::BadParameters)?
.next_multiple_of(PAGE_SIZE);
.and_then(|t| t.checked_next_multiple_of(PAGE_SIZE))
.ok_or(TeeResult::BadParameters)?;
if addr.checked_add(total_size).is_none() {
return Err(TeeResult::BadParameters);
}
Expand Down