Skip to content

validate number of indirect desc in pop_avail #1188

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
papertigers merged 4 commits into from
Aug 12, 2026
Merged

validate number of indirect desc in pop_avail #1188

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7edb9c
validate number of indirect desc in pop_avail
papertigers Jul 29, 2026
8e906ff
rebase
papertigers Aug 3, 2026
16963db
rebase
papertigers Aug 6, 2026
68d5ae3
review feedback
papertigers Aug 11, 2026
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
11 changes: 11 additions & 0 deletions lib/propolis/src/hw/virtio/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,21 @@ impl VirtQueue {
false => ChainBuf::Readable(GuestAddr(desc.addr), desc.len),
};

count += 1;
len += desc.len;
chain.push_buf(buf);

if flags.contains(DescFlag::NEXT) {
// The virto spec states:
//
// A driver MUST NOT create a descriptor chain longer than
// the Queue Size of the device
if count >= self.size() {
// TODO (#1190): This needs to properly signal the error
// condition
chain.idx = None;
return None;
}
// XXX: better error handling
desc = idescs.get(desc.next as usize).unwrap();
flags = DescFlag::from_bits_truncate(desc.flags);
Expand Down