From nobody Fri May 17 06:54:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1604389664; cv=none; d=zohomail.com; s=zohoarc; b=gPlaEIi3i2w6AGoCz7qxOjV8GXE5Md1ihPSuVbAD+KBpR6n+VabTjsXi+g8rd4kUVqGuiK6un5QPr3Sjk8ng/PAjF4MBZcrkA96gYxoYb+CZqoVUs5GQMX32YIWZkp2jUMhxlhy91x/nkYF69CZdYVregzsV+tIdEFfat3I1Uj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604389664; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ICrkEdsdEqd+qz4nQEOUc+gWv2BYj4zLujxoMD2yZRk=; b=bP+Cnm6akSEFfruLhYT+PlTeBh8HuIRSCLYz+BT+V4gBUgFEmQSH/WbDFb2xGaueprWB3/d/GaVnMft6XdjC+GN1xR77u+fRk7C9wYKBwwx0s9+5db73mmT0kJ4TknoIwAfhDmhe41QcQZuyclIiQIZ/rw6dVU5XOHIN7WjBqBs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604389664224340.26005917423606; Mon, 2 Nov 2020 23:47:44 -0800 (PST) Received: from localhost ([::1]:59552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZr2c-000868-4a for importer@patchew.org; Tue, 03 Nov 2020 02:47:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZr1S-0007Ur-PA; Tue, 03 Nov 2020 02:46:30 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZr1N-0006Ty-Hs; Tue, 03 Nov 2020 02:46:30 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CQMKX00fgzLqYl; Tue, 3 Nov 2020 15:46:07 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Tue, 3 Nov 2020 15:46:03 +0800 Message-ID: <5FA10ABA.1080109@huawei.com> Date: Tue, 3 Nov 2020 15:46:02 +0800 From: AlexChen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Subject: [PATCH] target/microblaze: Fix possible array out of bounds in mmu_write() Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 20:52:53 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Trivial , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The size of env->mmu.regs is 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX]. Reported-by: Euler Robot Signed-off-by: Alex Chen Reviewed-by: Edgar E. Iglesias Reviewed-by: Thomas Huth --- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index 1dbbb271c4..917ad6d69e 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, = uint32_t v) unsigned int i; qemu_log_mask(CPU_LOG_MMU, - "%s rn=3D%d=3D%x old=3D%x\n", __func__, rn, v, env->mmu.= regs[rn]); + "%s rn=3D%d=3D%x old=3D%x\n", __func__, rn, v, + rn < 3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX]); if (cpu->cfg.mmu < 2 || !cpu->cfg.mmu_tlb_access) { qemu_log_mask(LOG_GUEST_ERROR, "MMU access on MMU-less system\n"); --=20 2.19.1