• Ming Lei's avatar
    block: virtio_blk: fix handling single range discard request · af822aa6
    Ming Lei authored
    1f23816b ("virtio_blk: add discard and write zeroes support") starts
    to support multi-range discard for virtio-blk. However, the virtio-blk
    disk may report max discard segment as 1, at least that is exactly what
    qemu is doing.
    
    So far, block layer switches to normal request merge if max discard segment
    limit is 1, and multiple bios can be merged to single segment. This way may
    cause memory corruption in virtblk_setup_discard_write_zeroes().
    
    Fix the issue by handling single max discard segment in straightforward
    way.
    
    Fixes: 1f23816b ("virtio_blk: add discard and write zeroes support")
    Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
    Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
    Cc: Changpeng Liu <changpeng.liu@intel.com>
    Cc: Daniel Verkamp <dverkamp@chromium.org>
    Cc: Michael S. Tsirkin <mst@redhat.com>
    Cc: Stefan Hajnoczi <stefanha@redhat.com>
    Cc: Stefano Garzarella <sgarzare@redhat.com>
    Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
    af822aa6
virtio_blk.c 25.8 KB