Skip to content

Commit

Permalink
vhost/net: fix heads usage of ubuf_info
Browse files Browse the repository at this point in the history
ubuf info allocator uses guest controlled head as an index,
so a malicious guest could put the same head entry in the ring twice,
and we will get two callbacks on the same value.
To fix use upend_idx which is guaranteed to be unique.

Reported-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
mstsirkin authored and davem330 committed Mar 17, 2013
1 parent 3d84fa9 commit 46aa92d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/vhost/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@ static void handle_tx(struct vhost_net *net)
msg.msg_controllen = 0;
ubufs = NULL;
} else {
struct ubuf_info *ubuf = &vq->ubuf_info[head];
struct ubuf_info *ubuf;
ubuf = vq->ubuf_info + vq->upend_idx;

vq->heads[vq->upend_idx].len =
VHOST_DMA_IN_PROGRESS;
Expand Down

0 comments on commit 46aa92d

Please sign in to comment.