From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UocLe-00005R-5z for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UocLd-0004gj-4G for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:32:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UocLc-0004gX-TQ for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:32:05 -0400 From: Kevin Wolf Date: Mon, 17 Jun 2013 18:31:47 +0200 Message-Id: <1371486710-17793-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1371486710-17793-1-git-send-email-kwolf@redhat.com> References: <1371486710-17793-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 4/7] vmdk: byteswap VMDK4Header.desc_offset field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi Remember to byteswap VMDK4Header.desc_offset on big-endian machines. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/vmdk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 608daaf..ee50a73 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -507,8 +507,11 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, if (ret < 0) { return ret; } - if (header.capacity == 0 && header.desc_offset) { - return vmdk_open_desc_file(bs, flags, header.desc_offset << 9); + if (header.capacity == 0) { + int64_t desc_offset = le64_to_cpu(header.desc_offset); + if (desc_offset) { + return vmdk_open_desc_file(bs, flags, desc_offset << 9); + } } if (le64_to_cpu(header.gd_offset) == VMDK4_GD_AT_END) { -- 1.8.1.4