1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 51278f8bd3ab..22a4329ed200 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1198,7 +1198,7 @@ bool virtqueue_is_broken(struct virtqueue *_vq)
 {
         struct vring_virtqueue *vq = to_vvq(_vq);
 
-        return vq->broken;
+        return READ_ONCE(vq->broken);
 }
 EXPORT_SYMBOL_GPL(virtqueue_is_broken);
 
@@ -1212,7 +1212,9 @@ void virtio_break_device(struct virtio_device *dev)
 
         list_for_each_entry(_vq, &dev->vqs, list) {
                 struct vring_virtqueue *vq = to_vvq(_vq);
-                vq->broken = true;
+
+                /* Pairs with READ_ONCE() in virtqueue_is_broken(). */
+                WRITE_ONCE(vq->broken, true);
         }
 }
 EXPORT_SYMBOL_GPL(virtio_break_device);