From nobody Tue Feb 10 12:39:45 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523377705426110.40937297783955; Tue, 10 Apr 2018 09:28:25 -0700 (PDT) Received: from localhost ([::1]:55256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5w88-0005q8-G9 for importer@patchew.org; Tue, 10 Apr 2018 12:28:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5vzs-0007Pz-TJ for qemu-devel@nongnu.org; Tue, 10 Apr 2018 12:19:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5vzp-0002zj-R6 for qemu-devel@nongnu.org; Tue, 10 Apr 2018 12:19:52 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:51741) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5vzp-0002zA-M5 for qemu-devel@nongnu.org; Tue, 10 Apr 2018 12:19:49 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 67D6620F67; Tue, 10 Apr 2018 12:19:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 10 Apr 2018 12:19:49 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 13F5E1025E; Tue, 10 Apr 2018 12:19:49 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=pR29p4TUiK3sa4 dp2LyW2CpD3qS0ZeFqUNSBHgC+jZw=; b=iqsYcJoi7tRn2r1xDPn0b04PeUvSoM epRKF+IvQbHWy/eH3jhAnsLd1zkFt7f16tFzMzCtxU7RmqMOU48lCoEErvYht+MH W7ryp3wLrxb29CBlvc6O7udCaahZV4ay+X7oktd+CSmXsVmyyiCW4LJVvwp15rHu vfsBaDNCwSGpM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=pR29p4TUiK3sa4dp2LyW2CpD3qS0ZeFqUNSBHgC+jZw=; b=TqMaEwMU 6Jdc2Z1am6CypZntBSDAmUhsFDJtO5UFN+OJrNL7GlIgrsndx77tg8XPNHgqnK3u vXCs1p7Euh1dbtgM103qWGcY3uTaQWp4Qen54RnVJTi6jGLohXcujhqknmAohgsk OS8vrQ6f/oAXkhrGoCwhlEjZls2E2//3lUv85nSuniwS8ZZ/MU/gAkw8nOlHYJ91 Iz3oz2M5TMQXp6bNKxOudy8/zRbjU15PJdck2X8kIzJ/wy1nfekdmWRjWba/O66E hhMneKokpG2Xelh/r1LLzM0VLsNquII+XyvKKpkknvgy14fHxAd0ID2wOUzsWrx9 B8WZGa4GHHMSEg== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 12:19:44 -0400 Message-Id: <1523377186-32578-9-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523377186-32578-1-git-send-email-cota@braap.org> References: <1523377186-32578-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCH 08/10] target/arm: avoid integer overflow in next_page PC check 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: Peter Maydell , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the PC is in the last page of the address space, next_page_start overflows to 0. Fix it. Cc: Peter Maydell Signed-off-by: Emilio G. Cota --- target/arm/translate.h | 2 +- target/arm/translate.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/target/arm/translate.h b/target/arm/translate.h index c47febf..2287894 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -9,7 +9,7 @@ typedef struct DisasContext { DisasContextBase base; =20 target_ulong pc; - target_ulong next_page_start; + target_ulong page_start; uint32_t insn; /* Nonzero if this instruction has been conditionally skipped. */ int condjmp; diff --git a/target/arm/translate.c b/target/arm/translate.c index fc03b5b..ade8d2d 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9913,7 +9913,7 @@ static bool thumb_insn_is_16bit(DisasContext *s, uint= 32_t insn) return false; } =20 - if ((insn >> 11) =3D=3D 0x1e && (s->pc < s->next_page_start - 3)) { + if ((insn >> 11) =3D=3D 0x1e && s->pc - s->page_start < TARGET_PAGE_SI= ZE - 3) { /* 0b1111_0xxx_xxxx_xxxx : BL/BLX prefix, and the suffix * is not on the next page; we merge this into a 32-bit * insn. @@ -12269,8 +12269,7 @@ static int arm_tr_init_disas_context(DisasContextBa= se *dcbase, dc->is_ldex =3D false; dc->ss_same_el =3D false; /* Can't be true since EL_d must be AArch64 = */ =20 - dc->next_page_start =3D - (dc->base.pc_first & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + dc->page_start =3D dc->base.pc_first & TARGET_PAGE_MASK; =20 /* If architectural single step active, limit to 1. */ if (is_singlestepping(dc)) { @@ -12280,7 +12279,7 @@ static int arm_tr_init_disas_context(DisasContextBa= se *dcbase, /* ARM is a fixed-length ISA. Bound the number of insns to execute to those left on the page. */ if (!dc->thumb) { - int bound =3D (dc->next_page_start - dc->base.pc_first) / 4; + int bound =3D -(dc->base.pc_first | TARGET_PAGE_MASK) / 4; max_insns =3D MIN(max_insns, bound); } =20 @@ -12552,8 +12551,8 @@ static void thumb_tr_translate_insn(DisasContextBas= e *dcbase, CPUState *cpu) * but isn't very efficient). */ if (dc->base.is_jmp =3D=3D DISAS_NEXT - && (dc->pc >=3D dc->next_page_start - || (dc->pc >=3D dc->next_page_start - 3 + && (dc->pc - dc->page_start >=3D TARGET_PAGE_SIZE + || (dc->pc - dc->page_start >=3D TARGET_PAGE_SIZE - 3 && insn_crosses_page(env, dc)))) { dc->base.is_jmp =3D DISAS_TOO_MANY; } --=20 2.7.4