From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoT2E-0005H7-Ge for qemu-devel@nongnu.org; Fri, 08 Apr 2016 05:49:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoT2B-0007Hd-7q for qemu-devel@nongnu.org; Fri, 08 Apr 2016 05:49:02 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:61690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoT2B-0007HJ-1a for qemu-devel@nongnu.org; Fri, 08 Apr 2016 05:48:59 -0400 Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Websense Email with ESMTPS id 379838505588B for ; Fri, 8 Apr 2016 10:48:53 +0100 (IST) From: Leon Alrae Date: Fri, 8 Apr 2016 10:48:28 +0100 Message-ID: <1460108908-12747-2-git-send-email-leon.alrae@imgtec.com> In-Reply-To: <1460108908-12747-1-git-send-email-leon.alrae@imgtec.com> References: <1460108908-12747-1-git-send-email-leon.alrae@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PULL 1/1] hw/mips_itu: fix off-by-one reported by Coverity List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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) -- 2.1.0