]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
nbd: Fix 32-bit compilation on BLOCK_STATUS
authorEric Blake <eblake@redhat.com>
Tue, 27 Mar 2018 21:05:17 +0000 (16:05 -0500)
committerEric Blake <eblake@redhat.com>
Mon, 2 Apr 2018 13:45:21 +0000 (08:45 -0500)
iotests 123 and 209 fail on 32-bit platforms.  The culprit:
sizeof(extent) is wrong; we want sizeof(*extent).  But since
the struct is 8 bytes, it happened to work on 64-bit platforms
where the pointer is also 8 bytes (nasty).

Fixes: 78a33ab58
Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180327210517.1804242-1-eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
block/nbd-client.c

index e64e346d6903af04e84f4c35828de4b64b1b22a4..e7caf49fbb47e25161b709250a30d543702049bc 100644 (file)
@@ -239,7 +239,7 @@ static int nbd_parse_blockstatus_payload(NBDClientSession *client,
 {
     uint32_t context_id;
 
-    if (chunk->length != sizeof(context_id) + sizeof(extent)) {
+    if (chunk->length != sizeof(context_id) + sizeof(*extent)) {
         error_setg(errp, "Protocol error: invalid payload for "
                          "NBD_REPLY_TYPE_BLOCK_STATUS");
         return -EINVAL;