virtqueue_add_buffer must check that there is room for multiple buffers #368
Conversation
This file contains 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
tammyleino
force-pushed
the
openamp_358
branch
3 times, most recently
from
3f8f8d1
to
57e5173
Compare
arnopo
requested changes
Apr 12, 2022
lib/virtio/virtqueue.c
Outdated
| @@ -129,7 +129,7 @@ int virtqueue_add_buffer(struct virtqueue *vq, struct virtqueue_buf *buf_list, | |||
|
|
|||
| needed = readable + writable; | |||
|
|
|||
| VQ_PARAM_CHK(vq == NULL, status, ERROR_VQUEUE_INVLD_PARAM); | |||
| VQ_PARAM_CHK(vq < needed, status, ERROR_VQUEUE_INVLD_PARAM); | |||
There was a problem hiding this comment.
The comparison is not valid, you compare an integer with a structure pointer.
What about following check?
VQ_PARAM_CHK((needed < 1 || needed > vq->vq_free_cnt), status, ERROR_VQUEUE_INVLD_PARAM);
There was a problem hiding this comment.
That certainly makes more sense.
There was a problem hiding this comment.
I had actually fixed this as follows:
VQ_PARAM_CHK(vq->vq_free_cnt < needed, status, ERROR_VRING_FULL);
Not sure how I truncated vq_free_cnt on my commit.
Ensure there is enough room for all the buffers being added to the vring. Signed-off-by: Tammy Leino <tammy_leino@mentor.com>
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.
Ensure there is enough room for all the buffers being added to the vring.
Signed-off-by: Tammy Leino tammy_leino@mentor.com