Skip to content

Commit f5b4eb8

Browse files
Neeraj Upadhyaygregkh
authored andcommitted
vringh: Use wiov->used to check for read/write desc order
[ Upstream commit e74cfa91f42c50f7f649b0eca46aa049754ccdbd ] 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 <jasowang@redhat.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org> Link: https://lore.kernel.org/r/1624591502-4827-1-git-send-email-neeraju@codeaurora.org Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 5a8a635 commit f5b4eb8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/vhost/vringh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ __vringh_iov(struct vringh *vrh, u16 i,
329329
iov = wiov;
330330
else {
331331
iov = riov;
332-
if (unlikely(wiov && wiov->i)) {
332+
if (unlikely(wiov && wiov->used)) {
333333
vringh_bad("Readable desc %p after writable",
334334
&descs[i]);
335335
err = -EINVAL;

0 commit comments

Comments
 (0)