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

Open
papertigers wants to merge 1 commit into
base: spr/papertigers/master.validate-number-of-indirect-desc-in-pop_avail
Choose a base branch
from
Open

validate number of indirect desc in pop_avail #1188

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
6 changes: 6 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,16 @@ impl VirtQueue {
false => ChainBuf::Readable(GuestAddr(desc.addr), desc.len),
};

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

if flags.contains(DescFlag::NEXT) {
if count == self.size() {
// XXX: signal error condition?

@papertigers papertigers Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to address #1190 to properly solve this.
Currently return None and we also fail to return the descriptor to the used ring, this can leave the queue stalled or in an overall bad state.

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
You are viewing a condensed version of this merge commit. You can view the full changes here.