From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ3Lm-0002F5-Sr for qemu-devel@nongnu.org; Fri, 29 Jun 2018 20:02:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ3Lm-0007CM-22 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 20:02:50 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:38980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ3Ll-0007Az-TQ for qemu-devel@nongnu.org; Fri, 29 Jun 2018 20:02:50 -0400 Received: by mail-pl0-x242.google.com with SMTP id s24-v6so5168348plq.6 for ; Fri, 29 Jun 2018 17:02:49 -0700 (PDT) From: Richard Henderson Date: Fri, 29 Jun 2018 17:02:42 -0700 Message-Id: <20180630000242.29594-3-richard.henderson@linaro.org> In-Reply-To: <20180630000242.29594-1-richard.henderson@linaro.org> References: <20180630000242.29594-1-richard.henderson@linaro.org> Subject: [Qemu-devel] [PATCH 2/2] cpu: Assert asidx_from_attrs return value in range List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Signed-off-by: Richard Henderson --- include/qom/cpu.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index cce2fd6acc..bd796579ee 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -620,11 +620,13 @@ static inline hwaddr cpu_get_phys_page_debug(CPUState *cpu, vaddr addr) static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs) { CPUClass *cc = CPU_GET_CLASS(cpu); + int ret = 0; if (cc->asidx_from_attrs) { - return cc->asidx_from_attrs(cpu, attrs); + ret = cc->asidx_from_attrs(cpu, attrs); + assert(ret < cpu->num_ases && ret >= 0); } - return 0; + return ret; } #endif -- 2.17.1