From: Dmitry Fomichev Date: Wed, 27 Jan 2021 04:19:15 +0000 (+0900) Subject: zbd: avoid zone buffer overrun X-Git-Tag: fio-3.26~44 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c3f1cc187103675f65eecd2eba1535df5cd59ec;p=fio.git zbd: avoid zone buffer overrun If the total number of zones on a drive is calculated to a value that is less than the number of zones it can actually report, zone info buffer can be overrun. This may happen not only due to drive firmware problems, but also because of underlying software incorrectly reporting zoned device capacity. Fix this by more carefully setting zone report size. Signed-off-by: Dmitry Fomichev Reviewed-by: Shin'ichiro Kawasaki Signed-off-by: Jens Axboe --- diff --git a/zbd.c b/zbd.c index 019eaf62..a3c1ff9a 100644 --- a/zbd.c +++ b/zbd.c @@ -526,8 +526,9 @@ static int parse_zone_info(struct thread_data *td, struct fio_file *f) offset = z->start + z->len; if (j >= nr_zones) break; - nrz = zbd_report_zones(td, f, offset, - zones, ZBD_REPORT_MAX_ZONES); + nrz = zbd_report_zones(td, f, offset, zones, + min((uint32_t)(nr_zones - j), + ZBD_REPORT_MAX_ZONES)); if (nrz < 0) { ret = nrz; log_info("fio: report zones (offset %llu) failed for %s (%d).\n",