From patchwork Mon Apr 4 10:22:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Alrae X-Patchwork-Id: 605833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qdp324BrVz9sBM for ; Mon, 4 Apr 2016 20:22:54 +1000 (AEST) Received: from localhost ([::1]:57722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an1el-0001Uu-V9 for incoming@patchwork.ozlabs.org; Mon, 04 Apr 2016 06:22:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an1eW-0001Ca-B3 for qemu-devel@nongnu.org; Mon, 04 Apr 2016 06:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1an1eR-0001Az-4H for qemu-devel@nongnu.org; Mon, 04 Apr 2016 06:22:36 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:44721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an1eQ-00018b-UW for qemu-devel@nongnu.org; Mon, 04 Apr 2016 06:22:31 -0400 Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Websense Email Security Gateway with ESMTPS id 38F1BC51137C7; Mon, 4 Apr 2016 11:22:21 +0100 (IST) Received: from lalrae-linux.kl.imgtec.org (192.168.169.37) by hhmail02.hh.imgtec.org (10.100.10.20) with Microsoft SMTP Server (TLS) id 14.3.266.1; Mon, 4 Apr 2016 11:22:23 +0100 From: Leon Alrae To: Date: Mon, 4 Apr 2016 11:22:13 +0100 Message-ID: <1459765333-21698-1-git-send-email-leon.alrae@imgtec.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Originating-IP: [192.168.169.37] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH] hw/mips_itu: fix off-by-one reported by Coverity X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix off-by-one error in ITC Tag read. Remove the switch as we just want to check if index is in valid range rather than test against list of values. Signed-off-by: Leon Alrae --- hw/misc/mips_itu.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index 8461d23..da54550 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -66,18 +66,13 @@ static uint64_t itc_tag_read(void *opaque, hwaddr addr, unsigned size) { MIPSITUState *tag = (MIPSITUState *)opaque; uint64_t index = addr >> 3; - uint64_t ret = 0; - switch (index) { - case 0 ... ITC_ADDRESSMAP_NUM: - ret = tag->ITCAddressMap[index]; - break; - default: + if (index >= ITC_ADDRESSMAP_NUM) { qemu_log_mask(LOG_GUEST_ERROR, "Read 0x%" PRIx64 "\n", addr); - break; + return 0; } - return ret; + return tag->ITCAddressMap[index]; } static void itc_reconfigure(MIPSITUState *tag)