virtio: validate descriptor index from avail ring#3136
Open
benhillis wants to merge 1 commit intomicrosoft:mainfrom
Open
virtio: validate descriptor index from avail ring#3136benhillis wants to merge 1 commit intomicrosoft:mainfrom
benhillis wants to merge 1 commit intomicrosoft:mainfrom
Conversation
The descriptor index read from the guest's available ring was used directly without checking it against queue_size. A malicious or buggy guest could supply an out-of-range index, leading to out-of-bounds access in the descriptor table. Add an InvalidDescriptorIndex error variant to QueueError and validate the index in SplitQueueGetWork::get_available_descriptor_index().
Member
Author
|
replaces #2780 |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens the virtio split-queue path against malicious/buggy guests by validating that descriptor indices read from the avail ring are within queue_size, preventing out-of-bounds access to the descriptor table.
Changes:
- Add
QueueError::InvalidDescriptorIndex(u16)to represent out-of-range avail-ring indices. - Validate avail-ring descriptor indices in
SplitQueueGetWork::get_available_descriptor_index()and return the new error on invalid input.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
vm/devices/virtio/virtio/src/queue/split.rs |
Adds bounds-checking for descriptor indices read from the guest avail ring before using them. |
vm/devices/virtio/virtio/src/queue.rs |
Extends QueueError with an explicit error variant for invalid descriptor indices. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The descriptor index read from the guest's available ring was used directly without checking it against queue_size. A malicious or buggy guest could supply an out-of-range index, leading to out-of-bounds access in the descriptor table.
Add an InvalidDescriptorIndex error variant to QueueError and validate the index in SplitQueueGetWork::get_available_descriptor_index().