From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4Vy-0002EA-5A for qemu-devel@nongnu.org; Sat, 08 Feb 2014 04:48:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WC4Vr-0000Bu-Ak for qemu-devel@nongnu.org; Sat, 08 Feb 2014 04:47:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4Vr-0000Bb-2k for qemu-devel@nongnu.org; Sat, 08 Feb 2014 04:47:51 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s189ln3P007564 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 8 Feb 2014 04:47:50 -0500 From: Kevin Wolf Date: Sat, 8 Feb 2014 10:47:44 +0100 Message-Id: <1391852864-11969-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] block: Fix 32 bit truncation in mark_request_serialising() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, lersek@redhat.com, stefanha@redhat.com 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 --- 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