From nobody Mon Feb 9 09:17:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47EFAEB64D7 for ; Wed, 14 Jun 2023 03:24:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242449AbjFNDYP (ORCPT ); Tue, 13 Jun 2023 23:24:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233985AbjFNDYJ (ORCPT ); Tue, 13 Jun 2023 23:24:09 -0400 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB404198; Tue, 13 Jun 2023 20:24:06 -0700 (PDT) Received: from ed3e173716be.home.arpa (unknown [124.16.138.125]) by APP-03 (Coremail) with SMTP id rQCowADX3SHEMolkIQROAg--.40109S2; Wed, 14 Jun 2023 11:23:48 +0800 (CST) From: Jiasheng Jiang To: vburru@marvell.com, aayarekar@marvell.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, sburla@marvell.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jiasheng Jiang Subject: [PATCH] octeon_ep: Add missing check for ioremap Date: Wed, 14 Jun 2023 11:23:47 +0800 Message-Id: <20230614032347.32940-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: rQCowADX3SHEMolkIQROAg--.40109S2 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFy3KFW7uF4Dur4fJFy3XFb_yoW8Xw4Upr yUWayDX34rtr43W3ZrXw1UJFn09a1Yy3s5Kr97Aanag3s3tFn8Aa48AF40v3yUKFZ5uF13 tF1jy3Z3AFn7AaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvC14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2 Y2ka0xkIwI1lc2xSY4AK67AK6r48MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0x vE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2Kf nxnUUI43ZEXa7VUjQBMtUUUUU== X-Originating-IP: [124.16.138.125] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add check for ioremap() and return the error if it fails in order to guarantee the success of ioremap(). Fixes: 862cd659a6fb ("octeon_ep: Add driver framework and device initializa= tion") Signed-off-by: Jiasheng Jiang --- drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index e1853da280f9..06816d2baef8 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -969,7 +969,7 @@ static const char *octep_devid_to_str(struct octep_devi= ce *oct) int octep_device_setup(struct octep_device *oct) { struct pci_dev *pdev =3D oct->pdev; - int i, ret; + int i, j, ret; =20 /* allocate memory for oct->conf */ oct->conf =3D kzalloc(sizeof(*oct->conf), GFP_KERNEL); @@ -981,6 +981,9 @@ int octep_device_setup(struct octep_device *oct) oct->mmio[i].hw_addr =3D ioremap(pci_resource_start(oct->pdev, i * 2), pci_resource_len(oct->pdev, i * 2)); + if (!oct->mmio[i].hw_addr) + goto unsupported_dev; + oct->mmio[i].mapped =3D 1; } =20 @@ -1015,8 +1018,8 @@ int octep_device_setup(struct octep_device *oct) return 0; =20 unsupported_dev: - for (i =3D 0; i < OCTEP_MMIO_REGIONS; i++) - iounmap(oct->mmio[i].hw_addr); + for (j =3D 0; j < i; j++) + iounmap(oct->mmio[j].hw_addr); =20 kfree(oct->conf); return -1; --=20 2.25.1