diff options
| author | Amit Shah <amit.shah@redhat.com> | 2010-02-12 10:32:14 +0530 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-24 14:22:29 +1030 |
| commit | 3b8706240ee6084ccb46e53cd3a554356b7eeec8 (patch) | |
| tree | 213051dfce6ddf5eb09d89ead56214372d200338 | |
| parent | c021eac4148c16bf53baa0dd14e8ebee6f39dab5 (diff) | |
| download | op-kernel-dev-3b8706240ee6084ccb46e53cd3a554356b7eeec8.zip op-kernel-dev-3b8706240ee6084ccb46e53cd3a554356b7eeec8.tar.gz | |
virtio: Initialize vq->data entries to NULL
vq operations depend on vq->data[i] being NULL to figure out if the vq
entry is in use (since the previous patch).
We have to initialize them to NULL to ensure we don't work with junk
data and trigger false BUG_ONs.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Shirley Ma <xma@us.ibm.com>
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 782b729..0db906b 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -448,8 +448,11 @@ struct virtqueue *vring_new_virtqueue(unsigned int num, /* Put everything in free lists. */ vq->num_free = num; vq->free_head = 0; - for (i = 0; i < num-1; i++) + for (i = 0; i < num-1; i++) { vq->vring.desc[i].next = i+1; + vq->data[i] = NULL; + } + vq->data[i] = NULL; return &vq->vq; } |
