From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F672C433DB for ; Sun, 10 Jan 2021 21:52:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82E31227C3 for ; Sun, 10 Jan 2021 21:52:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82E31227C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eik.bme.hu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kyid7-0002K4-BI for qemu-devel@archiver.kernel.org; Sun, 10 Jan 2021 16:52:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyicW-0001qo-94 for qemu-devel@nongnu.org; Sun, 10 Jan 2021 16:51:32 -0500 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:35007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyicT-0005fl-9q for qemu-devel@nongnu.org; Sun, 10 Jan 2021 16:51:31 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 44EE37470E3; Sun, 10 Jan 2021 22:51:24 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 0F5B4746552; Sun, 10 Jan 2021 22:51:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 0D53E74645B; Sun, 10 Jan 2021 22:51:24 +0100 (CET) Date: Sun, 10 Jan 2021 22:51:24 +0100 (CET) From: BALATON Zoltan To: =?ISO-8859-15?Q?Philippe_Mathieu-Daud=E9?= Subject: Re: [PULL 23/35] hw/intc: Rework Loongson LIOINTC In-Reply-To: Message-ID: <3aece87-60ff-b195-8bd-c696bf461cb6@eik.bme.hu> References: <20210103205021.2837760-1-f4bug@amsat.org> <20210103205021.2837760-24-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="3866299591-27589913-1610315484=:48736" Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: Peter Maydell , Huacai Chen , QEMU Developers , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --3866299591-27589913-1610315484=:48736 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT On Sun, 10 Jan 2021, Philippe Mathieu-Daudé wrote: > Hi Peter, Huacai, > > On 1/10/21 8:49 PM, Peter Maydell wrote: >> On Sun, 3 Jan 2021 at 21:11, Philippe Mathieu-Daudé wrote: >>> >>> From: Huacai Chen >>> >>> As suggested by Philippe Mathieu-Daudé, rework Loongson's liointc: >>> 1, Move macro definitions to loongson_liointc.h; >>> 2, Remove magic values and use macros instead; >>> 3, Replace dead D() code by trace events. >>> >>> Suggested-by: Philippe Mathieu-Daudé >>> Signed-off-by: Huacai Chen >>> Tested-by: Philippe Mathieu-Daudé >>> Reviewed-by: Philippe Mathieu-Daudé >>> Message-Id: <20201221110538.3186646-2-chenhuacai@kernel.org> >>> Signed-off-by: Philippe Mathieu-Daudé >>> --- >>> include/hw/intc/loongson_liointc.h | 22 ++++++++++++++++++ >>> hw/intc/loongson_liointc.c | 36 +++++++++++++----------------- >>> 2 files changed, 38 insertions(+), 20 deletions(-) >>> create mode 100644 include/hw/intc/loongson_liointc.h >> >> Hi; Coverity complains about a possible array overrun >> in this commit: >> >> >>> @@ -40,13 +39,10 @@ >>> #define R_IEN 0x24 >>> #define R_IEN_SET 0x28 >>> #define R_IEN_CLR 0x2c >>> -#define R_PERCORE_ISR(x) (0x40 + 0x8 * x) >>> +#define R_ISR_SIZE 0x8 >>> +#define R_START 0x40 >>> #define R_END 0x64 >>> >>> -#define TYPE_LOONGSON_LIOINTC "loongson.liointc" >>> -DECLARE_INSTANCE_CHECKER(struct loongson_liointc, LOONGSON_LIOINTC, >>> - TYPE_LOONGSON_LIOINTC) >>> - >>> struct loongson_liointc { >>> SysBusDevice parent_obj; >>> >>> @@ -123,14 +119,13 @@ liointc_read(void *opaque, hwaddr addr, unsigned int size) >>> goto out; >>> } >>> >>> - /* Rest is 4 byte */ >>> + /* Rest are 4 bytes */ >>> if (size != 4 || (addr % 4)) { >>> goto out; >>> } >>> Expanding macros in the following: >>> - if (addr >= R_PERCORE_ISR(0) && >>> - addr < R_PERCORE_ISR(NUM_CORES)) { >>> - int core = (addr - R_PERCORE_ISR(0)) / 8; if (addr >= (0x40 + 0x8 * 0) && addr < (0x40 + 0x8 * 4)) -> if (addr >= 0x40 && addr < 0x60) int core = (addr - 0x40) / 8; >>> + if (addr >= R_START && addr < R_END) { >>> + int core = (addr - R_START) / R_ISR_SIZE; if (addr >= 0x40 && addr < 0x64) int core = (addr - 0x40) / 0x8; R_END seems to be off by 4 in the above. Should it be 0x60? Regards, BALATON Zoltan >> R_END is 0x64 and R_START is 0x40, so if addr is 0x60 >> then addr - R_START is 0x32 and so core here is 4. >> However p->per_core_isr[] only has 4 entries, so this will >> be off the end of the array. >> >> This is CID 1438965. >> >>> r = p->per_core_isr[core]; >>> goto out; >>> } >> >>> - if (addr >= R_PERCORE_ISR(0) && >>> - addr < R_PERCORE_ISR(NUM_CORES)) { >>> - int core = (addr - R_PERCORE_ISR(0)) / 8; >>> + if (addr >= R_START && addr < R_END) { >>> + int core = (addr - R_START) / R_ISR_SIZE; >>> p->per_core_isr[core] = value; >>> goto out; >>> } >> >> Same thing here, CID 1438967. > > Thanks Peter. > > Huacai, can you have a look please? > > Thanks, > > Phil. > > --3866299591-27589913-1610315484=:48736--