block: Fix 32 bit truncation in mark_request_serialising()
PATCH 1/1 block: Fix 32 bit truncation in mark_request_serialising()
On 32 bit hosts, size_t is too small for align as the bitmask ~(align - 1) will zero out the higher 32 bits of the offset.
While at it, change the local overlap_bytes variable to unsigned to match the field in BdrvTrackedRequest.
Signed-off-by Kevin Wolf <[email protected]>
--- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block.c +3 -3
@@ -2240,11 +2240,11 @@ static void tracked_request_begin(BdrvTrackedRequest *req,QLIST_INSERT_HEAD (&bs->tracked_requests, req, list); } -static void mark_request_serialising (BdrvTrackedRequest *req,size_t align) +static void mark_request_serialising (BdrvTrackedRequest *req,uint64_t align) {int64_t overlap_offset = req->offset & ~(align -1 ); -int overlap_bytes =ROUND_UP (req->offset + req->bytes, align) - - overlap_offset; +unsigned int overlap_bytes =ROUND_UP (req->offset + req->bytes, align) + - overlap_offset;if (!req->serialising) { req->bs->serialising_in_flight++;
Signature · 1 line
1.8.1.4
Quoted 21 lines · Kevin Wolf
On 32 bit hosts,
size_tis too small for align as the bitmask ~(align - 1) will zero out the higher 32 bits of the offset.While at it, change the local
overlap_bytesvariable to unsigned to match the field in BdrvTrackedRequest.Signed-off-by Kevin Wolf <[email protected]>--- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)block.c +0
-1@@ -2240,11 +2240,11 @@ static void tracked_request_begin(BdrvTrackedRequest *req,QLIST_INSERT_HEAD (&bs->tracked_requests, req, list); } -static void mark_request_serialising (BdrvTrackedRequest *req,size_t align)
block.c static void tracked_request_begin(BdrvTrackedRequest *req, · line 2250
Quoted 10 lines
block.c +3
-2+static void mark_request_serialising (BdrvTrackedRequest *req,uint64_t align) {int64_t overlap_offset = req->offset & ~(align -1 ); -int overlap_bytes =ROUND_UP (req->offset + req->bytes, align) - - overlap_offset; +unsigned int overlap_bytes =ROUND_UP (req->offset + req->bytes, align) + - overlap_offset;if (!req->serialising) { req->bs->serialising_in_flight++;
Reviewed-by Laszlo Ersek <[email protected]>
Thanks!
Laszlo