From patchwork Mon Nov 5 16:37:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 150215 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2828916ljp; Mon, 5 Nov 2018 08:47:17 -0800 (PST) X-Google-Smtp-Source: AJdET5fQ7m1E0FQVivOmeDS6a/+IaMtXN7czak6ePOKU/fpFd3InLTUd3X+icrElN2XjA9uqxr6g X-Received: by 2002:a0c:c611:: with SMTP id v17mr9405647qvi.68.1541436437300; Mon, 05 Nov 2018 08:47:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541436437; cv=none; d=google.com; s=arc-20160816; b=ENGzahhMk8GZKadClv4BfDeu/t/ewFb+vI5NunwwJ7A23Vy1V4BXQDsgvMwacFVls8 PYzysGjcfOOZvXhHB9hnI0mIRo1FvvHvMJbUEn0CmZjXEdXymtcg3Jr46q6wtnHulCsw 6OXZ6DVBUHllqRAr5zre//raLzdWm93v7reytBOgH+WFHryHo8/XjlWouWVUTb2sBW8r Ypoy2oypkQ1qGB5gf6sDoe06jN2qRl2I7jEL6+NUesVIe8lkVtvFwzR1io3Qa5SOhknz +ceEw74nKWqPUaJAoXMc1yALm3udf9BQSuH3+TXzHbT7rE813ktjHuh50y+Y1UXlRhzp lZyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=kp+btyaEsflNZ/yvzkneaUlhSGNgxXjfdN79gcsZh/k=; b=K/qMVHzQNaNs4K2twuUGgVzTBxB3YWCEc9CjLNLOLDZhul+L0KRBopr77mPXrRh/sT xgczo1ufYgDFDae6VSKynIwPRdjq041PjPO/CJOFXACMRn7MmT7PWQMLXvbBAdZR5/jy QpVusmLQsU2soQknzmROoqQTLUDl44KiAFCzlCnPeLCugN7CKon+pXviYziVz2V53rJO CIMazaHJF2NIKJlIfTYsaNahL0Ga/nExtcW+LoBl6zW+r3Wns2bc2o2C8jDt5r3NkmI3 FLUUPNnn5wyKGBNTFLnTw4jrlFsFEZ5UoIb2wRpgMpl7VmVeYqZuQhypHwldiLErOKFO 4NYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c127-v6si9653326qkf.236.2018.11.05.08.47.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Nov 2018 08:47:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJi20-0002Lp-KP for patch@linaro.org; Mon, 05 Nov 2018 11:47:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJhtJ-0006wm-13 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:38:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJhtH-0003V2-9z for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:38:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35794) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJht3-0002bq-Cb; Mon, 05 Nov 2018 11:38:01 -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 E5FAEC004AB3; Mon, 5 Nov 2018 16:37:58 +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 D3A5060C46; Mon, 5 Nov 2018 16:37:57 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 5 Nov 2018 17:37:13 +0100 Message-Id: <20181105163744.25139-6-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.32]); Mon, 05 Nov 2018 16:37:58 +0000 (UTC) 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 05/36] block/qcow: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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. This patch was produced with the following spatch script: @@ expression E; @@ -be16_to_cpus(&E); +E = be16_to_cpu(E); @@ expression E; @@ -be32_to_cpus(&E); +E = be32_to_cpu(E); @@ expression E; @@ -be64_to_cpus(&E); +E = be64_to_cpu(E); @@ expression E; @@ -cpu_to_be16s(&E); +E = cpu_to_be16(E); @@ expression E; @@ -cpu_to_be32s(&E); +E = cpu_to_be32(E); @@ expression E; @@ -cpu_to_be64s(&E); +E = cpu_to_be64(E); Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Tested-by: John Snow Reviewed-by: John Snow Signed-off-by: Kevin Wolf --- block/qcow.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.19.1 diff --git a/block/qcow.c b/block/qcow.c index 385d935258..4518cb4c35 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -140,14 +140,14 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, if (ret < 0) { goto fail; } - be32_to_cpus(&header.magic); - be32_to_cpus(&header.version); - be64_to_cpus(&header.backing_file_offset); - be32_to_cpus(&header.backing_file_size); - be32_to_cpus(&header.mtime); - be64_to_cpus(&header.size); - be32_to_cpus(&header.crypt_method); - be64_to_cpus(&header.l1_table_offset); + header.magic = be32_to_cpu(header.magic); + header.version = be32_to_cpu(header.version); + header.backing_file_offset = be64_to_cpu(header.backing_file_offset); + header.backing_file_size = be32_to_cpu(header.backing_file_size); + header.mtime = be32_to_cpu(header.mtime); + header.size = be64_to_cpu(header.size); + header.crypt_method = be32_to_cpu(header.crypt_method); + header.l1_table_offset = be64_to_cpu(header.l1_table_offset); if (header.magic != QCOW_MAGIC) { error_setg(errp, "Image not in qcow format"); @@ -270,7 +270,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, } for(i = 0;i < s->l1_size; i++) { - be64_to_cpus(&s->l1_table[i]); + s->l1_table[i] = be64_to_cpu(s->l1_table[i]); } /* alloc L2 cache (max. 64k * 16 * 8 = 8 MB) */