Commit e96126ff authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent eaf944a4

block.c

+3 −3
Original line number Diff line number Diff line
@@ -2240,10 +2240,10 @@ 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)

    unsigned int overlap_bytes = ROUND_UP(req->offset + req->bytes, align)

                               - overlap_offset;



    if (!req->serialising) {