Skip to content

Commit a9637ab

Browse files
damien-lemoalaxboe
authored andcommitted
zloop: fix zone append check in zloop_rw()
While commit cf28f6f ("zloop: fail zone append operations that are targeting full zones") added a check in zloop_rw() that a zone append is not issued to a full zone, commit e3a96ca ("zloop: simplify checks for writes to sequential zones") inadvertently removed the check to verify that there is enough unwritten space in a zone for an incoming zone append opration. Re-add this check in zloop_rw() to make sure we do not write beyond the end of a zone. Of note is that this same check is already present in the function zloop_set_zone_append_sector() when ordered zone append is in use. Reported-by: Hans Holmberg <Hans.Holmberg@wdc.com> Fixes: e3a96ca ("zloop: simplify checks for writes to sequential zones") Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hans Holmberg <hans.holmberg@wdc.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent ebcc028 commit a9637ab

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/block/zloop.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ static void zloop_rw(struct zloop_cmd *cmd)
448448
* and set the target sector in zloop_queue_rq().
449449
*/
450450
if (!zlo->ordered_zone_append) {
451-
if (zone->cond == BLK_ZONE_COND_FULL) {
451+
if (zone->cond == BLK_ZONE_COND_FULL ||
452+
zone->wp + nr_sectors > zone_end) {
452453
spin_unlock_irqrestore(&zone->wp_lock,
453454
flags);
454455
ret = -EIO;

0 commit comments

Comments
 (0)