Skip to content

fix(virtio): don't include optional fields in minimum size #1986

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
merged 1 commit into from
Oct 23, 2025
Merged

fix(virtio): don't include optional fields in minimum size #1986

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
5 changes: 3 additions & 2 deletions src/drivers/virtio/transport/pci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ impl PciCap {
return None;
}

// Drivers MAY do this check. See Virtio specification v1.1. - 4.1.4.1
if self.len() < u64::try_from(mem::size_of::<CommonCfg>()).unwrap() {
// `CommonCfg::queue_notify_data` and `CommonCfg::queue_reset` are optional.
const MIN_SIZE: usize = mem::size_of::<CommonCfg>() - mem::size_of::<[le16; 2]>();
if self.len() < u64::try_from(MIN_SIZE).unwrap() {
error!(
"Common config of with id {}, does not represent actual structure specified by the standard!",
self.cap.id
Expand Down