| Message ID | 20180327210517.1804242-1-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27/03/2018 23:05, Eric Blake wrote: > 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> > --- > block/nbd-client.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/nbd-client.c b/block/nbd-client.c > index e64e346d690..e7caf49fbb4 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; > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
28.03.2018 00:05, Eric Blake wrote: > 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> > --- > block/nbd-client.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/nbd-client.c b/block/nbd-client.c > index e64e346d690..e7caf49fbb4 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; my mistake, sorry for it :( Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
diff --git a/block/nbd-client.c b/block/nbd-client.c index e64e346d690..e7caf49fbb4 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;
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> --- block/nbd-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)