From: Paolo Bonzini Date: Mon, 10 Oct 2016 19:58:58 +0000 (+0200) Subject: rbd: shift byte count as a 64-bit value X-Git-Tag: v2.7.1~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=857efecf91f41105f919844ef71992e247817e3e;p=thirdparty%2Fqemu.git rbd: shift byte count as a 64-bit value Otherwise, reads of more than 2GB fail. Until commit 7bbca9e290a9c7c217b5a24fc6094e91e54bd05d, reads of 2^41 bytes succeeded at least theoretically. In fact, pdiscard ought to receive a 64-bit integer as the count for the same reason. Reported by Coverity. Fixes: 7bbca9e290a9c7c217b5a24fc6094e91e54bd05d Cc: qemu-stable@nongnu.org Cc: kwolf@redhat.com Cc: eblake@redhat.com Signed-off-by: Paolo Bonzini (cherry picked from commit e948f663e9334249c394b88926addcdd3f9e35cd) Signed-off-by: Michael Roth --- diff --git a/block/rbd.c b/block/rbd.c index 0106fea45f6..5cefdbb0f4a 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -737,7 +737,7 @@ static BlockAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs, void *opaque) { return rbd_start_aio(bs, sector_num << BDRV_SECTOR_BITS, qiov, - nb_sectors << BDRV_SECTOR_BITS, cb, opaque, + (int64_t) nb_sectors << BDRV_SECTOR_BITS, cb, opaque, RBD_AIO_READ); } @@ -749,7 +749,7 @@ static BlockAIOCB *qemu_rbd_aio_writev(BlockDriverState *bs, void *opaque) { return rbd_start_aio(bs, sector_num << BDRV_SECTOR_BITS, qiov, - nb_sectors << BDRV_SECTOR_BITS, cb, opaque, + (int64_t) nb_sectors << BDRV_SECTOR_BITS, cb, opaque, RBD_AIO_WRITE); }