diff options
| author | Eric Blake | 2018-03-27 23:05:17 +0200 |
|---|---|---|
| committer | Eric Blake | 2018-04-02 15:45:21 +0200 |
| commit | 00d96a4612f81e82c181fe821d527e98abcbac07 (patch) | |
| tree | deab23533921cef2da3f8379068683c701f6e350 | |
| parent | Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-critical-fix... (diff) | |
| download | qemu-00d96a4612f81e82c181fe821d527e98abcbac07.tar.gz qemu-00d96a4612f81e82c181fe821d527e98abcbac07.tar.xz qemu-00d96a4612f81e82c181fe821d527e98abcbac07.zip | |
nbd: Fix 32-bit compilation on BLOCK_STATUS
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>
| -rw-r--r-- | block/nbd-client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/nbd-client.c b/block/nbd-client.c index e64e346d69..e7caf49fbb 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -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; |