Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions src/devices/src/virtio/queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,7 @@ impl<'a> DescriptorChain<'a> {
return None;
}

let desc_head = match mem.checked_offset(desc_table, (index as usize) * 16) {
Some(a) => a,
None => return None,
};
let desc_head = mem.checked_offset(desc_table, (index as usize) * 16)?;
mem.checked_offset(desc_head, 16)?;

// These reads can't fail unless Guest memory is hopelessly broken.
Expand Down
2 changes: 1 addition & 1 deletion src/polly/src/event_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ impl EventManager {
pollable,
&epoll::EpollEvent::default(),
)
.map_or(false, |_| {
.is_ok_and(|_| {
self.epoll
.ctl(
epoll::ControlOperation::Delete,
Expand Down