From 712669c9fa9278704a4ccefe1d96acaf29397d36 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 2 Sep 2020 12:43:02 +0300 Subject: 13103 zfs: zvol_strategy() warn: unsigned 'off' is never less than zero Reviewed by: Robert Mustacchi Reviewed by: Igor Kozhukhov Approved by: Dan McDonald --- usr/src/uts/common/fs/zfs/zvol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/src/uts/common/fs/zfs/zvol.c') diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index 83dbf67e98..02eb0b8e1a 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -1226,7 +1226,7 @@ zvol_strategy(buf_t *bp) addr = bp->b_un.b_addr; resid = bp->b_bcount; - if (resid > 0 && (off < 0 || off >= volsize)) { + if (resid > 0 && off >= volsize) { bioerror(bp, EIO); biodone(bp); return (0); -- cgit v1.2.3 From 92db730eedd4fcf11958d5b89b6d63f99488d594 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 2 Sep 2020 12:48:02 +0300 Subject: 13117 zfs: variable dereferenced before check Reviewed by: Andrew Stormont Reviewed by: C Fraire Reviewed by: Patrick Mooney Approved by: Robert Mustacchi --- usr/src/uts/common/fs/zfs/zvol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr/src/uts/common/fs/zfs/zvol.c') diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index 02eb0b8e1a..55dd9a2681 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -1155,10 +1155,10 @@ zvol_dumpio(zvol_state_t *zv, void *addr, uint64_t offset, uint64_t size, ASSERT(size <= zv->zv_volblocksize); /* Locate the extent this belongs to */ - ze = list_head(&zv->zv_extents); - while (offset >= ze->ze_nblks * zv->zv_volblocksize) { + for (ze = list_head(&zv->zv_extents); + ze != NULL && offset >= ze->ze_nblks * zv->zv_volblocksize; + ze = list_next(&zv->zv_extents, ze)) { offset -= ze->ze_nblks * zv->zv_volblocksize; - ze = list_next(&zv->zv_extents, ze); } if (ze == NULL) -- cgit v1.2.3