Commit 1861ba62 authored Jan 06, 2022 by Michael S. Tsirkin

virtio_ring: mark ring unused on error

A recently added error path does not mark ring unused when exiting on
OOM, which will lead to BUG on the next entry in debug builds.

TODO: refactor code so we have START_USE and END_USE in the same function.

Fixes: fc6d70f4 ("virtio_ring: check desc == NULL when using indirect with packed")
Cc: "Xuan Zhuo" <xuanzhuo@linux.alibaba.com>
Cc: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent 08006392

drivers/virtio/virtio_ring.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1197,8 +1197,10 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
		if (virtqueue_use_indirect(_vq, total_sg)) {
		err = virtqueue_add_indirect_packed(vq, sgs, total_sg, out_sgs,
		in_sgs, data, gfp);
		if (err != -ENOMEM)
		if (err != -ENOMEM) {
		END_USE(vq);
		return err;
		}

		/* fall back on direct */
		}