From nobody Sat Apr 27 18:55:20 2024 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; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517062787615753.99492946381; Sat, 27 Jan 2018 06:19:47 -0800 (PST) Received: from localhost ([::1]:50931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efRKX-00010R-4V for importer@patchew.org; Sat, 27 Jan 2018 09:19:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efQrb-0001KI-Az for qemu-devel@nongnu.org; Sat, 27 Jan 2018 08:49:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efQrX-0001mg-0J for qemu-devel@nongnu.org; Sat, 27 Jan 2018 08:49:47 -0500 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:37361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efQrW-0001lx-OY for qemu-devel@nongnu.org; Sat, 27 Jan 2018 08:49:42 -0500 Received: by mail-lf0-x243.google.com with SMTP id 63so4033937lfv.4 for ; Sat, 27 Jan 2018 05:49:42 -0800 (PST) Received: from tro-notebook.lan ([185.16.100.222]) by smtp.gmail.com with ESMTPSA id t68sm1936611lfe.28.2018.01.27.05.49.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Jan 2018 05:49:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8kzpPv06s3YoMoowQo39cb16QlY1B1xo2mQS4fndom0=; b=J3U9/QSZaXB64qxkt3qiUAwdifWKVreejqRj97EvoTFE/JRXf+RVDO7jA60WsZMZJK NclOlVOqqzwygSTuio2XIf5YndSnVDCCcxwPlNYiRhRypRl/DfdLccHpdeDhAhtYqwsF /x8EslNPBdez7uhBCojXjPQdSfrshfWdk7NRUsd6s0NGlVSnDoL0wyQ6yhAjMuxdtHkL DXQ6dadbqwZT7eMxI/k7TjF6ZO4kzJa/aIWVB7utzWCTnApY/0F1ZgWCzfMMDBIOhCzv NVsZmLpbHWP2YsT1/1KACE2TYrgvZd3kOm/R7PAcyWxv8veG6U1iHh5/L2nGQoLMEvP+ 4NMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8kzpPv06s3YoMoowQo39cb16QlY1B1xo2mQS4fndom0=; b=Y+71qiqlwbxbPFMhiUPrL/pyS8/FNz8L/A6eBcnPyu2Amrizpe4AqsdsKskvrEfdFW gU7eai05MTEyfdEZr0+DRuzFI2az9kmNDgHKxaQV9ZGYNr/EX7nlw+kexZsQOcINNQ1D 8HNbHae5mHYwP6j1wZodeVcOfhb5RhrNYftzftthITnnZFpAPSXnXAr0p+KwruL8nFmi URhDDRBJLAlOrirPDp+EN3lIbYRmW8dYyMnzl3UH3QvyCGTOmQv+9TrRDEmGpjgcZWVP S9IsIlpS2WcSOIf92y9p+jtZqOy3sflsbwroueD2GYENqsnWdlOWZanJF1GOp8kaDVIR I7gg== X-Gm-Message-State: AKwxytcIyVL9+gaC1UlSSRHFDR74KlDYchkitsqzzvDGHxYyAShmnMEv Rc9w14wr6y9rWv/UJtQyOD6vzn9s X-Google-Smtp-Source: AH8x227eo3NAGtq56ozlFpvjgWfNInINXRbX2sRPnNbKYi+JTb7z54WvRcWa6l5HYIKnDZOkylJFoQ== X-Received: by 10.25.76.138 with SMTP id z132mr10377709lfa.134.1517060981169; Sat, 27 Jan 2018 05:49:41 -0800 (PST) From: Anatoly Trosinenko To: qemu-devel@nongnu.org Date: Sat, 27 Jan 2018 16:49:08 +0300 Message-Id: <20180127134908.24095-2-anatoly.trosinenko@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180127134908.24095-1-anatoly.trosinenko@gmail.com> References: <20180127134908.24095-1-anatoly.trosinenko@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 X-Mailman-Approved-At: Sat, 27 Jan 2018 09:16:57 -0500 Subject: [Qemu-devel] [PATCH 1/1] tci: eliminate UB due to unaligned reads 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: Stefan Weil , Anatoly Trosinenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use ldl_he_p / ldq_he_p functions instead of a plain memory access through pointer. Signed-off-by: Anatoly Trosinenko --- tcg/tci.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index 33edca1903..410817cf6a 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -159,7 +159,13 @@ static uint64_t tci_uint64(uint32_t high, uint32_t low) /* Read constant (native size) from bytecode. */ static tcg_target_ulong tci_read_i(uint8_t **tb_ptr) { - tcg_target_ulong value =3D *(tcg_target_ulong *)(*tb_ptr); +#if TCG_TARGET_REG_BITS =3D=3D 32 + tcg_target_ulong value =3D ldl_he_p(*tb_ptr); +#elif TCG_TARGET_REG_BITS =3D=3D 64 + tcg_target_ulong value =3D ldq_he_p(*tb_ptr); +#else +#error unsupported +#endif *tb_ptr +=3D sizeof(value); return value; } @@ -167,7 +173,7 @@ static tcg_target_ulong tci_read_i(uint8_t **tb_ptr) /* Read unsigned constant (32 bit) from bytecode. */ static uint32_t tci_read_i32(uint8_t **tb_ptr) { - uint32_t value =3D *(uint32_t *)(*tb_ptr); + uint32_t value =3D ldl_he_p(*tb_ptr); *tb_ptr +=3D sizeof(value); return value; } @@ -175,7 +181,7 @@ static uint32_t tci_read_i32(uint8_t **tb_ptr) /* Read signed constant (32 bit) from bytecode. */ static int32_t tci_read_s32(uint8_t **tb_ptr) { - int32_t value =3D *(int32_t *)(*tb_ptr); + int32_t value =3D ldl_he_p(*tb_ptr); *tb_ptr +=3D sizeof(value); return value; } @@ -184,7 +190,7 @@ static int32_t tci_read_s32(uint8_t **tb_ptr) /* Read constant (64 bit) from bytecode. */ static uint64_t tci_read_i64(uint8_t **tb_ptr) { - uint64_t value =3D *(uint64_t *)(*tb_ptr); + uint64_t value =3D ldq_he_p(*tb_ptr); *tb_ptr +=3D sizeof(value); return value; } @@ -1094,7 +1100,7 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t= *tb_ptr) /* QEMU specific operations. */ =20 case INDEX_op_exit_tb: - ret =3D *(uint64_t *)tb_ptr; + ret =3D ldq_he_p(tb_ptr); goto exit; break; case INDEX_op_goto_tb: --=20 2.14.1