From nobody Tue Feb 10 12:39:38 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 1523377326432866.520993458604; Tue, 10 Apr 2018 09:22:06 -0700 (PDT) Received: from localhost ([::1]:55129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5w21-0000On-In for importer@patchew.org; Tue, 10 Apr 2018 12:22:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5vzs-0007Py-Tb 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 1f5vzq-000307-1x for qemu-devel@nongnu.org; Tue, 10 Apr 2018 12:19:52 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44229) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5vzp-0002yh-Tr 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 7C90C20D6B; Tue, 10 Apr 2018 12:19:48 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 10 Apr 2018 12:19:48 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 38A251025E; Tue, 10 Apr 2018 12:19:48 -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=EAGsXOSmV4nfAs JCUr7d6BC6FGN2U7dWKlD56PmwpHA=; b=fyMxRWM9+DdT/wf387rHaHVBYweG6l Lr5zZ/gkqkinVWMynYho3M0JXYmL/zqc1to1mewxf5v5KIBc+0gc7zrxdlpanAR1 VlnjbvWmqwkWeCm56MJ94URLHaVjgU7BjeS/YV6YHp/t7hkUmEzFB1Dc3tFM9uJr 7gca2zuN2kREc= 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=EAGsXOSmV4nfAsJCUr7d6BC6FGN2U7dWKlD56PmwpHA=; b=gaS1uyxq ibQr3YI3czQU0XbRm88fWykiLNwhqY/dnsHLmnZAXmCQEIZA3/K8UzT/ZELcnJ0A +rE06mFpoqxDF/Inh0KLnoY+LeVV11TfCPt3tC+ob9Ptk36imR6BmRrR9jvCfTaQ 3QdO1erCBhWi/HFGr+rIRXjnql4xt5f0XvbX3qLt0IdwxKheOhmoDqsAtNZ6m4ga PGYrYlhKxzzQSuuUSZiBiysDMElfZlcHuziObdGdlazyooTjKYXju/f48vDF3DVk LFJkybvmYX2tl2t1oVguNhSwIhSnMgSVC29u1GtqIQR/jehm81lH0qDYKa9G3m9n RB/kceK/RU8Bsw== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 12:19:40 -0400 Message-Id: <1523377186-32578-5-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 04/10] target/xtensa: 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: Max Filippov , 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: Max Filippov Signed-off-by: Emilio G. Cota Acked-by: Max Filippov --- target/xtensa/translate.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 4f6d030..aad4963 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -1061,8 +1061,7 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock *tb) int insn_count =3D 0; int max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; uint32_t pc_start =3D tb->pc; - uint32_t next_page_start =3D - (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + uint32_t page_start =3D pc_start & TARGET_PAGE_MASK; =20 if (max_insns =3D=3D 0) { max_insns =3D CF_COUNT_MASK; @@ -1162,9 +1161,9 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock *tb) } } while (dc.is_jmp =3D=3D DISAS_NEXT && insn_count < max_insns && - dc.pc < next_page_start && - dc.pc + xtensa_insn_len(env, &dc) <=3D next_page_start && - !tcg_op_buf_full()); + dc.pc - page_start < TARGET_PAGE_SIZE && + dc.pc - page_start + xtensa_insn_len(env, &dc) <=3D TARGET_PAG= E_SIZE + && !tcg_op_buf_full()); done: reset_sar_tracker(&dc); if (dc.icount) { --=20 2.7.4