From nobody Mon May 5 07:59:16 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1541437686321386.0244878097253;
Mon, 5 Nov 2018 09:08:06 -0800 (PST)
Received: from localhost ([::1]:36362 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1gJiM4-0008Pk-Ia
for importer@patchew.org; Mon, 05 Nov 2018 12:08:00 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52961)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1gJhy9-00051N-C7
for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:43:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1gJhy7-0008Ds-SY
for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:43:17 -0500
Received: from mx1.redhat.com ([209.132.183.28]:35070)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1gJhy1-00046p-EZ; Mon, 05 Nov 2018 11:43:09 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id A2DE08E5A4;
Mon, 5 Nov 2018 16:38:35 +0000 (UTC)
Received: from linux.fritz.box.com (ovpn-117-198.ams2.redhat.com
[10.36.117.198])
by smtp.corp.redhat.com (Postfix) with ESMTP id E19AF60C46;
Mon, 5 Nov 2018 16:38:31 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Mon, 5 Nov 2018 17:37:21 +0100
Message-Id: <20181105163744.25139-14-kwolf@redhat.com>
In-Reply-To: <20181105163744.25139-1-kwolf@redhat.com>
References: <20181105163744.25139-1-kwolf@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.28]);
Mon, 05 Nov 2018 16:38:35 +0000 (UTC)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 13/36] block/vdi: Don't take address of fields
in packed structs
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Content-Type: text/plain; charset="utf-8"
From: Peter Maydell <peter.maydell@linaro.org>
Taking the address of a field in a packed struct is a bad idea, because
it might not be actually aligned enough for that pointer type (and
thus cause a crash on dereference on some host architectures). Newer
versions of clang warn about this. Avoid the bug by not using the
"modify in place" byte swapping functions.
There are a few places where the in-place swap function is
used on something other than a packed struct field; we convert
those anyway, for consistency.
Patch produced with scripts/coccinelle/inplace-byteswaps.cocci.
There are other places where we take the address of a packed member
in this file for other purposes than passing it to a byteswap
function (all the calls to qemu_uuid_*()); we leave those for now.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/vdi.c | 64 ++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 6555cffb88..0ff1ead736 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -187,22 +187,22 @@ typedef struct {
=20
static void vdi_header_to_cpu(VdiHeader *header)
{
- le32_to_cpus(&header->signature);
- le32_to_cpus(&header->version);
- le32_to_cpus(&header->header_size);
- le32_to_cpus(&header->image_type);
- le32_to_cpus(&header->image_flags);
- le32_to_cpus(&header->offset_bmap);
- le32_to_cpus(&header->offset_data);
- le32_to_cpus(&header->cylinders);
- le32_to_cpus(&header->heads);
- le32_to_cpus(&header->sectors);
- le32_to_cpus(&header->sector_size);
- le64_to_cpus(&header->disk_size);
- le32_to_cpus(&header->block_size);
- le32_to_cpus(&header->block_extra);
- le32_to_cpus(&header->blocks_in_image);
- le32_to_cpus(&header->blocks_allocated);
+ header->signature =3D le32_to_cpu(header->signature);
+ header->version =3D le32_to_cpu(header->version);
+ header->header_size =3D le32_to_cpu(header->header_size);
+ header->image_type =3D le32_to_cpu(header->image_type);
+ header->image_flags =3D le32_to_cpu(header->image_flags);
+ header->offset_bmap =3D le32_to_cpu(header->offset_bmap);
+ header->offset_data =3D le32_to_cpu(header->offset_data);
+ header->cylinders =3D le32_to_cpu(header->cylinders);
+ header->heads =3D le32_to_cpu(header->heads);
+ header->sectors =3D le32_to_cpu(header->sectors);
+ header->sector_size =3D le32_to_cpu(header->sector_size);
+ header->disk_size =3D le64_to_cpu(header->disk_size);
+ header->block_size =3D le32_to_cpu(header->block_size);
+ header->block_extra =3D le32_to_cpu(header->block_extra);
+ header->blocks_in_image =3D le32_to_cpu(header->blocks_in_image);
+ header->blocks_allocated =3D le32_to_cpu(header->blocks_allocated);
qemu_uuid_bswap(&header->uuid_image);
qemu_uuid_bswap(&header->uuid_last_snap);
qemu_uuid_bswap(&header->uuid_link);
@@ -211,22 +211,22 @@ static void vdi_header_to_cpu(VdiHeader *header)
=20
static void vdi_header_to_le(VdiHeader *header)
{
- cpu_to_le32s(&header->signature);
- cpu_to_le32s(&header->version);
- cpu_to_le32s(&header->header_size);
- cpu_to_le32s(&header->image_type);
- cpu_to_le32s(&header->image_flags);
- cpu_to_le32s(&header->offset_bmap);
- cpu_to_le32s(&header->offset_data);
- cpu_to_le32s(&header->cylinders);
- cpu_to_le32s(&header->heads);
- cpu_to_le32s(&header->sectors);
- cpu_to_le32s(&header->sector_size);
- cpu_to_le64s(&header->disk_size);
- cpu_to_le32s(&header->block_size);
- cpu_to_le32s(&header->block_extra);
- cpu_to_le32s(&header->blocks_in_image);
- cpu_to_le32s(&header->blocks_allocated);
+ header->signature =3D cpu_to_le32(header->signature);
+ header->version =3D cpu_to_le32(header->version);
+ header->header_size =3D cpu_to_le32(header->header_size);
+ header->image_type =3D cpu_to_le32(header->image_type);
+ header->image_flags =3D cpu_to_le32(header->image_flags);
+ header->offset_bmap =3D cpu_to_le32(header->offset_bmap);
+ header->offset_data =3D cpu_to_le32(header->offset_data);
+ header->cylinders =3D cpu_to_le32(header->cylinders);
+ header->heads =3D cpu_to_le32(header->heads);
+ header->sectors =3D cpu_to_le32(header->sectors);
+ header->sector_size =3D cpu_to_le32(header->sector_size);
+ header->disk_size =3D cpu_to_le64(header->disk_size);
+ header->block_size =3D cpu_to_le32(header->block_size);
+ header->block_extra =3D cpu_to_le32(header->block_extra);
+ header->blocks_in_image =3D cpu_to_le32(header->blocks_in_image);
+ header->blocks_allocated =3D cpu_to_le32(header->blocks_allocated);
qemu_uuid_bswap(&header->uuid_image);
qemu_uuid_bswap(&header->uuid_last_snap);
qemu_uuid_bswap(&header->uuid_link);
--=20
2.19.1