Skip to content

Commit e74cfa9

Browse files
Neeraj Upadhyaymstsirkin
authored andcommitted
vringh: Use wiov->used to check for read/write desc order
As __vringh_iov() traverses a descriptor chain, it populates each descriptor entry into either read or write vring iov and increments that iov's ->used member. So, as we iterate over a descriptor chain, at any point, (riov/wriov)->used value gives the number of descriptor enteries available, which are to be read or written by the device. As all read iovs must precede the write iovs, wiov->used should be zero when we are traversing a read descriptor. Current code checks for wiov->i, to figure out whether any previous entry in the current descriptor chain was a write descriptor. However, iov->i is only incremented, when these vring iovs are consumed, at a later point, and remain 0 in __vringh_iov(). So, correct the check for read and write descriptor order, to use wiov->used. Acked-by: Jason Wang <[email protected]> Reviewed-by: Stefano Garzarella <[email protected]> Signed-off-by: Neeraj Upadhyay <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent cb5d2c1 commit e74cfa9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/vhost/vringh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ __vringh_iov(struct vringh *vrh, u16 i,
359359
iov = wiov;
360360
else {
361361
iov = riov;
362-
if (unlikely(wiov && wiov->i)) {
362+
if (unlikely(wiov && wiov->used)) {
363363
vringh_bad("Readable desc %p after writable",
364364
&descs[i]);
365365
err = -EINVAL;

0 commit comments

Comments
 (0)