[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] block: Fix 32 bit truncation in mark_request_se
From: |
Laszlo Ersek |
Subject: |
Re: [Qemu-devel] [PATCH] block: Fix 32 bit truncation in mark_request_serialising() |
Date: |
Sat, 08 Feb 2014 10:53:28 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131118 Thunderbird/17.0.11 |
On 02/08/14 10:47, Kevin Wolf wrote:
> 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 <address@hidden>
> ---
> 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++;
>
Reviewed-by: Laszlo Ersek <address@hidden>
Thanks!
Laszlo