aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2021-10-06 15:17:07 +0200
committerEric Blake <eblake@redhat.com>2021-10-15 15:39:40 -0500
commit7242db6389261cb936bd2240351b137843d49807 (patch)
treeb4daa4d7c538aa23b9e9340b7ea30511eb249041 /block
parente7e588d432d31ecebc26358e47201dd108db964c (diff)
block-backend: blk_check_byte_request(): int64_t bytes
Rename size and make it int64_t to correspond to modern block layer, which always uses int64_t for offset and bytes (not in blk layer yet, which is a task for following commits). All callers pass int or unsigned int. So, for bytes in [0, INT_MAX] nothing is changed, for negative bytes we now fail on "bytes < 0" check instead of "bytes > INT_MAX" check. Note, that blk_check_byte_request() still doesn't allow requests exceeding INT_MAX. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20211006131718.214235-2-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/block-backend.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index ba2b5ebb10..2c62210687 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1161,11 +1161,11 @@ void blk_set_disable_request_queuing(BlockBackend *blk, bool disable)
}
static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
- size_t size)
+ int64_t bytes)
{
int64_t len;
- if (size > INT_MAX) {
+ if (bytes < 0 || bytes > INT_MAX) {
return -EIO;
}
@@ -1183,7 +1183,7 @@ static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
return len;
}
- if (offset > len || len - offset < size) {
+ if (offset > len || len - offset < bytes) {
return -EIO;
}
}