Linux virtualization list
 help / color / mirror / Atom feed
From: Damien Le Moal <dlemoal@kernel.org>
To: Annie Kim <pulpannie@gmail.com>,
	"Michael S . Tsirkin" <mst@redhat.com>,
	Jason Wang <jasowangio@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>,
	virtualization@lists.linux.dev, linux-block@vger.kernel.org,
	linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] virtio_blk: validate zone append sector from device
Date: Fri, 20 Nov 2026 05:29:52 -0800	[thread overview]
Message-ID: <83804b12-39c7-41cf-8a70-2bab8b3fa2b0@kernel.org> (raw)
In-Reply-To: <20261120063039.4155597-1-pulpannie@gmail.com>

On 2026/11/19 22:30, Annie Kim wrote:
> From: Hyokyung Kim <pulpannie@gmail.com>
> 
> The device reports the starting sector for REQ_OP_ZONE_APPEND completions,
> and virtio_blk copies it into req->__sector without checking that it
> still refers to the requested zone. A buggy or malicious device can
> therefore make upper layers believe the append landed at an arbitrary
> location.
> 
> Validate successful zone append completions before updating
> req->__sector. The returned sector must not precede the request start
> and the entire request must fit within the zone writable capacity.
> Reject invalid completions with BLK_STS_IOERR.
> 
> The polling path may batch successful completions, so perform the same
> validation before admitting a request to the batch. Invalid append
> completions then fall back to the normal completion path and are
> completed with an error instead of being reported as successful.
> 
> Fixes: 95bfec41bd3d ("virtio-blk: add support for zoned block devices")
> Assisted-by: Codex:GPT-5

This tag is not necessary.

> Signed-off-by: Hyokyung Kim <pulpannie@gmail.com>
> ---
> Tested on v7.4-rc3+ using modified QEMU backend that returned incorrect
> zone-append sectors on a memory-backed null_blk zoned device.
> 
>  drivers/block/virtio_blk.c | 50 +++++++++++++++++++++++++++++++-------
>  1 file changed, 41 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 2b462005c..8f88570b4 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -331,15 +331,45 @@ static inline u8 virtblk_vbr_status(struct virtblk_req *vbr)
>  	return *((u8 *)&vbr->in_hdr + vbr->in_hdr_len - 1);
>  }
>  
> -static inline void virtblk_update_zone_append_sector(struct request *req,
> -						     struct virtblk_req *vbr)
> +#ifdef CONFIG_BLK_DEV_ZONED
> +static inline blk_status_t
> +virtblk_update_zone_append_sector(struct request *req,
> +				  struct virtblk_req *vbr,
> +				  blk_status_t status)
>  {
>  	struct virtio_blk *vblk = req->mq_hctx->queue->queuedata;
> +	sector_t req_start, sector, zone_end;
> +	unsigned int nr_sectors;
> +
> +	if (req_op(req) != REQ_OP_ZONE_APPEND || status != BLK_STS_OK)
> +		return status;

I would move this if outside of the function and call this function under this
if. That would avoid passing status, make this function a void one, and avoid
unnecessary function calls for commands other than zone append when the inline
is not honored by the compiler.

> +
> +	req_start = blk_rq_pos(req);
> +	sector = virtio64_to_cpu(vblk->vdev, vbr->in_hdr.zone_append.sector);
> +	nr_sectors = blk_rq_sectors(req);

req_start and nr_sectors could be initialized when declared.

Other than this, this looks fine to me.

> +	zone_end = req_start + disk_zone_capacity(vblk->disk, req_start);
> +
> +	if (zone_end < req_start || sector < req_start || sector >= zone_end ||
> +	    nr_sectors > zone_end - sector) {
> +		dev_err_ratelimited(&vblk->vdev->dev,
> +				    "zone append sector %llu + %u outside valid range [%llu, %llu)\n",
> +				    (u64)sector, nr_sectors,
> +				    (u64)req_start, (u64)zone_end);
> +		return BLK_STS_IOERR;
> +	}
>  
> -	if (req_op(req) == REQ_OP_ZONE_APPEND)
> -		req->__sector = virtio64_to_cpu(vblk->vdev,
> -						vbr->in_hdr.zone_append.sector);
> +	req->__sector = sector;
> +	return status;
>  }
> +#else
> +static inline blk_status_t
> +virtblk_update_zone_append_sector(struct request *req,
> +				  struct virtblk_req *vbr,
> +				  blk_status_t status)
> +{
> +	return status;
> +}
> +#endif
>  
>  static inline void virtblk_request_done(struct request *req)
>  {
> @@ -349,7 +379,7 @@ static inline void virtblk_request_done(struct request *req)
>  	virtblk_unmap_data(req, vbr);
>  	virtblk_cleanup_cmd(req);
>  
> -	virtblk_update_zone_append_sector(req, vbr);
> +	status = virtblk_update_zone_append_sector(req, vbr, status);
>  
>  	blk_mq_end_request(req, status);
>  }
> @@ -1242,7 +1272,6 @@ static void virtblk_complete_batch(struct io_comp_batch *iob)
>  
>  		virtblk_unmap_data(req, vbr);
>  		virtblk_cleanup_cmd(req);
> -		virtblk_update_zone_append_sector(req, vbr);
>  	}
>  	blk_mq_end_request_batch(iob);
>  }
> @@ -1260,11 +1289,14 @@ static int virtblk_poll(struct blk_mq_hw_ctx *hctx, struct io_comp_batch *iob)
>  
>  	while ((vbr = virtqueue_get_buf(vq->vq, &len)) != NULL) {
>  		struct request *req = blk_mq_rq_from_pdu(vbr);
> -		u8 status = virtblk_vbr_status(vbr);
> +		blk_status_t status;
> +
> +		status = virtblk_result(virtblk_vbr_status(vbr));
> +		status = virtblk_update_zone_append_sector(req, vbr, status);
>  
>  		found++;
>  		if (!blk_mq_complete_request_remote(req) &&
> -		    !blk_mq_add_to_batch(req, iob, status != VIRTIO_BLK_S_OK,
> +		    !blk_mq_add_to_batch(req, iob, status != BLK_STS_OK,
>  					 virtblk_complete_batch))
>  			virtblk_request_done(req);
>  	}


-- 
Damien Le Moal
Western Digital Research

      parent reply	other threads:[~2026-11-20 13:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20  6:30 [PATCH] virtio_blk: validate zone append sector from device Annie Kim
2026-11-20  6:47 ` sashiko-bot
2026-11-20 13:29 ` Damien Le Moal [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83804b12-39c7-41cf-8a70-2bab8b3fa2b0@kernel.org \
    --to=dlemoal@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=jasowangio@gmail.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=pulpannie@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=virtualization@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox