From nobody Tue Feb 10 15:44:48 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 1523377558203536.3480702058148; Tue, 10 Apr 2018 09:25:58 -0700 (PDT) Received: from localhost ([::1]:55208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5w5l-0003mr-96 for importer@patchew.org; Tue, 10 Apr 2018 12:25:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5vzs-0007Pv-SJ 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-000302-0w for qemu-devel@nongnu.org; Tue, 10 Apr 2018 12:19:52 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:59271) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5vzp-0002zM-Sn; 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 8C9C520DA1; Tue, 10 Apr 2018 12:19:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) 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 489C2E4472; 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=QyPj3Q9V2BqNnE 85CVcCpn57ztJ7/61qMBV/RmNT/OM=; b=kHE9AMm3p+1vJs/CXzwzLmsifRECry mdRUtLUMKIlYDr+/kDhJxnZX+7IsFLO6ZPMUTqALD8sSvd16uDENP53HCByGZFDc NjSWQ9q8h+9fjy533qEkStaOIi1odDTTHoD+TIX9RccvF/8+5n4NDI2sOaccAWEd 9gFvGxupYbLEA= 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=QyPj3Q9V2BqNnE85CVcCpn57ztJ7/61qMBV/RmNT/OM=; b=BK4E7ePG 5gUyEdHNCtnMtJdpNZ3W8cZXIOncQJapmtXlaun4rJBOJY+JKQB8RTRX0oigz8D/ Vz8MSJESAYgPY/GrKiij61Igc73jnrNbi+IvllEaVs9lURSASLMGmn4/BrW/UGTt sYY8E3/BFkrU40rWp/qFc2N8+Zs5twYYpyog06sK1+84ccqiOeNGu/1mSAGqhobJ gjwwbIFbh8FdyTp4nxmEqBuuINxxLlIKtWiUATHHGqtGhT8PTajEDUKqB/5qUIPt DBUKn9m8pXB2W7BjNZIV2agj95BFgJxqQNK67fPSV+eAyy50aoSIqhP5PhsEB1xG fCMy/S6HatYLdQ== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 12:19:45 -0400 Message-Id: <1523377186-32578-10-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 09/10] target/s390x: 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: qemu-s390x@nongnu.org, Cornelia Huck , Richard Henderson , Alexander Graf , David Hildenbrand 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: Cornelia Huck Cc: Alexander Graf Cc: David Hildenbrand Cc: qemu-s390x@nongnu.org Signed-off-by: Emilio G. Cota Acked-by: Cornelia Huck Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth --- target/s390x/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 7d39ab3..44449f1 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -6163,7 +6163,7 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) CPUS390XState *env =3D cs->env_ptr; DisasContext dc; target_ulong pc_start; - uint64_t next_page_start; + uint64_t page_start; int num_insns, max_insns; ExitStatus status; bool do_debug; @@ -6181,7 +6181,7 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) dc.ex_value =3D tb->cs_base; do_debug =3D dc.singlestep_enabled =3D cs->singlestep_enabled; =20 - next_page_start =3D (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + page_start =3D pc_start & TARGET_PAGE_MASK; =20 num_insns =3D 0; max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; @@ -6218,7 +6218,7 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) /* If we reach a page boundary, are single stepping, or exhaust instruction count, stop generation. */ if (status =3D=3D NO_EXIT - && (dc.pc >=3D next_page_start + && (dc.pc - page_start >=3D TARGET_PAGE_SIZE || tcg_op_buf_full() || num_insns >=3D max_insns || singlestep --=20 2.7.4