lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 532/563] virtio_ring: mark ring unused on error
    Date
    From: Michael S. Tsirkin <mst@redhat.com>

    commit 1861ba626ae9b98136f3e504208cdef6b29cd3ec upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/virtio/virtio_ring.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/virtio/virtio_ring.c
    +++ b/drivers/virtio/virtio_ring.c
    @@ -1124,8 +1124,10 @@ static inline int virtqueue_add_packed(s
    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 */
    }

    \
     
     \ /
      Last update: 2022-01-24 23:09    [W:3.083 / U:24.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site