diff options
author | Heinz Graalfs <graalfs@linux.vnet.ibm.com> | 2013-11-10 20:22:43 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-11-10 20:23:26 -0500 |
commit | 2bf4fd31394a3f875ea093ee8a209f30b378cbf3 (patch) | |
tree | 4889f6272a152930d7cc72c2a30c88d55f57ba39 /drivers | |
parent | cdd77e87eae52b7251acc5990207a1c4500a84ce (diff) |
virtio_scsi: verify if queue is broken after virtqueue_get_buf()
If virtqueue_get_buf() returned with a NULL pointer avoid a possibly
endless loop by checking for a broken virtqueue.
Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/virtio_scsi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index e6bb2352df40..c3173dced870 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c | |||
@@ -224,6 +224,9 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi, | |||
224 | virtqueue_disable_cb(vq); | 224 | virtqueue_disable_cb(vq); |
225 | while ((buf = virtqueue_get_buf(vq, &len)) != NULL) | 225 | while ((buf = virtqueue_get_buf(vq, &len)) != NULL) |
226 | fn(vscsi, buf); | 226 | fn(vscsi, buf); |
227 | |||
228 | if (unlikely(virtqueue_is_broken(vq))) | ||
229 | break; | ||
227 | } while (!virtqueue_enable_cb(vq)); | 230 | } while (!virtqueue_enable_cb(vq)); |
228 | spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags); | 231 | spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags); |
229 | } | 232 | } |