From patchwork Wed May 9 17:54:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135338 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp61295lji; Wed, 9 May 2018 11:08:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrVIeeApVJ1jkAt/CF37jpp3fo8RZlf7sgQkC7AGJNtY+TxHMQ4+NBpzo3EMpg/LUjprInD X-Received: by 2002:ac8:321a:: with SMTP id x26-v6mr42394574qta.130.1525889332656; Wed, 09 May 2018 11:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525889332; cv=none; d=google.com; s=arc-20160816; b=crgbIeTqP9PXyXF/tQ1O5pjyod7IQhTGq3C94k2AxSlY26M4dGk+0xEEV6Airj2CBq 9Te3O1ERRt9qw2B8MG2MiLtiu71CFealzw22Nzt8ZkkEOvdR2he07kI91ZFYfJbbb/I9 4Rb5yb8H8I9doVxwN5uRPUT9SsloGso4nr6DyRAspuf0LBdtDUeq43UCzBsl3fdEVWBU 28EgdkVnfF8eEn8tI3SgSbu0kVbusE2x13bAfAXWRB9PIPOL5ZtCqBBfhpl3u4/aziOk 55AFfxa1V9Re2rWf5uUaIk8cGcuH9gRTaG/sduMuemrMKQXeo9oyfimeFb7dBhpUkXlS +0Zg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=WSZEg5EdAHc97+c/MhKzc898Jicxq2TErADybKOef6Q=; b=HtsVb5XFr5LqkSUPw9PCLmEZduZKdqNEA5OYve9unA2OvlmrBGQ8HuFefGJUJIa0qF JIV7jFxp+n6bJQ1/0tOjQpCbBPyuDQpVy60vTZutUbefbEqDaCZbr2v1f3nEbRBZ3ss3 cVOmy9kpDFkwNbAmEFT6No3M02BO8v8JuG5B7VoBQy5f0KGPOVARiD7rQ4lIPPDHx4Ga EGHEFPUpYBET1DJNlL3+qazilvpLPdj+06ygry139TO+92BZAUVt+U7JJQVlD58E1pm7 Ti3plvOMpZOFpiW9nUV3+CabBVnG6E182l4LKMZissHNAFJncQrXamEJHUexMGCt41WA mhEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D7lmuUiX; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p31-v6si4196576qtp.295.2018.05.09.11.08.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 09 May 2018 11:08:52 -0700 (PDT) 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; dkim=fail header.i=@linaro.org header.s=google header.b=D7lmuUiX; 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=linaro.org Received: from localhost ([::1]:58191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGTWG-0002MX-2Y for patch@linaro.org; Wed, 09 May 2018 14:08:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGTJ8-0004fj-It for qemu-devel@nongnu.org; Wed, 09 May 2018 13:55:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGTJ5-0005OU-P9 for qemu-devel@nongnu.org; Wed, 09 May 2018 13:55:18 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:45812) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGTJ5-0005NK-IA for qemu-devel@nongnu.org; Wed, 09 May 2018 13:55:15 -0400 Received: by mail-pg0-x244.google.com with SMTP id w3-v6so2473370pgv.12 for ; Wed, 09 May 2018 10:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WSZEg5EdAHc97+c/MhKzc898Jicxq2TErADybKOef6Q=; b=D7lmuUiXY7yKhv+7NXcT3duBNOukyr1JVdT3wezh1l49iJzWwKIbFqEb8wg++7p1Sa a4GRdQyrSbw4ya/q8LiuqkUAXEF0QcNm+C2dSINuCp1/Cjd/j0UTu2zSps5VxIN9pS2C PiZZlp8xrDeqbOLIkHgw/mb+hUrPkWGHtibkg= 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=WSZEg5EdAHc97+c/MhKzc898Jicxq2TErADybKOef6Q=; b=lLR8SJCqxp5Qjkao80AJ7COmgeiuYjeTMU01DBUoXo2wmw5gw2FdbEDKE8gAwXWIw0 hJ8f5WBraqZQHAbdh324sB9VwOohkQ9lkIfG/ghDgghvzi51xLlVJiEQwEKnuuZjQ4/J FQ7CPgFDdllFUbuI8D8/W3k2rp9leQbcBFRBD4jlLQ26UQKI01TXXM9Vd1FdkRKvTv0F +Or5r+TeubTiC3UH/tMyByCDMO0Qx1yezygSkgu/+ar8ZcgoN7Ei6FCT80jeqEfkprmw hjs5365KHagHVqb1XEBfjuY+ERi4hBS/RLm3Zd1Tv3oZh1J53d8ZkhwWGmsgxbAjEN/7 D1tA== X-Gm-Message-State: ALQs6tDA6x+F/B2pKtN41A/Vz4CwSnLq6mMWD0zx+XtzVEvkMWcts+W+ LLLghpKHZCy+qiQyvZUpyew/Fz8HLFk= X-Received: by 2002:a63:751a:: with SMTP id q26-v6mr36146302pgc.338.1525888514127; Wed, 09 May 2018 10:55:14 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id l90sm60332813pfb.149.2018.05.09.10.55.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 10:55:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 9 May 2018 10:54:38 -0700 Message-Id: <20180509175458.15642-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509175458.15642-1-richard.henderson@linaro.org> References: <20180509175458.15642-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PULL 08/28] 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@linaro.org, Sagar Karandikar , David Hildenbrand , Palmer Dabbelt , Mark Cave-Ayland , Max Filippov , Michael Clark , "Edgar E. Iglesias" , Guan Xuetao , Yongbok Kim , Alexander Graf , "Emilio G. Cota" , Richard Henderson , Artyom Tarasenko , Eduardo Habkost , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Stafford Horne , David Gibson , Peter Crosthwaite , Bastian Koppelmann , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" If the PC is in the last page of the address space, next_page_start overflows to 0. Fix it. Reviewed-by: Richard Henderson Cc: Peter Maydell Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- target/arm/translate.h | 2 +- target/arm/translate.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) -- 2.17.0 diff --git a/target/arm/translate.h b/target/arm/translate.h index 4428c98e2e..37a1bba056 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -9,7 +9,7 @@ typedef struct DisasContext { DisasContextBase base; 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 ad208867a7..0f6629f745 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9930,7 +9930,7 @@ static bool thumb_insn_is_16bit(DisasContext *s, uint32_t insn) return false; } - if ((insn >> 11) == 0x1e && (s->pc < s->next_page_start - 3)) { + if ((insn >> 11) == 0x1e && s->pc - s->page_start < TARGET_PAGE_SIZE - 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. @@ -12301,8 +12301,7 @@ static int arm_tr_init_disas_context(DisasContextBase *dcbase, dc->is_ldex = false; dc->ss_same_el = false; /* Can't be true since EL_d must be AArch64 */ - dc->next_page_start = - (dc->base.pc_first & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + dc->page_start = dc->base.pc_first & TARGET_PAGE_MASK; /* If architectural single step active, limit to 1. */ if (is_singlestepping(dc)) { @@ -12312,7 +12311,7 @@ static int arm_tr_init_disas_context(DisasContextBase *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 = (dc->next_page_start - dc->base.pc_first) / 4; + int bound = -(dc->base.pc_first | TARGET_PAGE_MASK) / 4; max_insns = MIN(max_insns, bound); } @@ -12584,8 +12583,8 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) * but isn't very efficient). */ if (dc->base.is_jmp == DISAS_NEXT - && (dc->pc >= dc->next_page_start - || (dc->pc >= dc->next_page_start - 3 + && (dc->pc - dc->page_start >= TARGET_PAGE_SIZE + || (dc->pc - dc->page_start >= TARGET_PAGE_SIZE - 3 && insn_crosses_page(env, dc)))) { dc->base.is_jmp = DISAS_TOO_MANY; }