Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: fc6d70f40b3d ("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>

+3 -1
+3 -1
drivers/virtio/virtio_ring.c
··· 1197 1197 if (virtqueue_use_indirect(_vq, total_sg)) { 1198 1198 err = virtqueue_add_indirect_packed(vq, sgs, total_sg, out_sgs, 1199 1199 in_sgs, data, gfp); 1200 - if (err != -ENOMEM) 1200 + if (err != -ENOMEM) { 1201 + END_USE(vq); 1201 1202 return err; 1203 + } 1202 1204 1203 1205 /* fall back on direct */ 1204 1206 }