The following changes since commit 12067650d11d4777dee0cd64a136923c2fd2d073:
t/zbd: add -s option to test-zbd-support script (2024-02-07 08:43:13 -0500)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 9cfa60d874e9a1da057677619a370409428ea3cf:
verify: fix potential overflow before widen (2024-02-08 17:45:41 -0500)
----------------------------------------------------------------
Oleg Krasnov (1):
fix wrong offset for VERIFY_PATTERN_NO_HDR
Vincent Fu (2):
Merge branch 'fix-offset' of https://github.com/onkrasnov/fio
verify: fix potential overflow before widen
verify.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
---
Diff of recent changes:
diff --git a/verify.c b/verify.c
index 78f333e6..b438eed6 100644
--- a/verify.c
+++ b/verify.c
@@ -338,12 +338,20 @@ static void dump_verify_buffers(struct verify_header *hdr, struct vcont *vc)
static void log_verify_failure(struct verify_header *hdr, struct vcont *vc)
{
unsigned long long offset;
+ uint32_t len;
+ struct thread_data *td = vc->td;
offset = vc->io_u->verify_offset;
- offset += vc->hdr_num * hdr->len;
+ if (td->o.verify != VERIFY_PATTERN_NO_HDR) {
+ len = hdr->len;
+ offset += (unsigned long long) vc->hdr_num * len;
+ } else {
+ len = vc->io_u->buflen;
+ }
+
log_err("%.8s: verify failed at file %s offset %llu, length %u"
" (requested block: offset=%llu, length=%llu, flags=%x)\n",
- vc->name, vc->io_u->file->file_name, offset, hdr->len,
+ vc->name, vc->io_u->file->file_name, offset, len,
vc->io_u->verify_offset, vc->io_u->buflen, vc->io_u->flags);
if (vc->good_crc && vc->bad_crc) {
