From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCQ2k-0003wa-IA for qemu-devel@nongnu.org; Sun, 09 Feb 2014 03:47:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCQ2e-0001Be-I6 for qemu-devel@nongnu.org; Sun, 09 Feb 2014 03:47:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCQ2e-0001BY-B1 for qemu-devel@nongnu.org; Sun, 09 Feb 2014 03:47:08 -0500 From: Kevin Wolf Date: Sun, 9 Feb 2014 09:46:30 +0100 Message-Id: <1391935590-12264-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1391935590-12264-1-git-send-email-kwolf@redhat.com> References: <1391935590-12264-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 18/18] block: Fix 32 bit truncation in mark_request_serialising() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Reviewed-by: Laszlo Ersek --- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index b0c5025..636aa11 100644 --- a/block.c +++ b/block.c @@ -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++; -- 1.8.1.4