From nobody Fri Sep 19 08:34:35 2025 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 8BC62C43217 for ; Fri, 25 Nov 2022 13:28:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229711AbiKYN2p (ORCPT ); Fri, 25 Nov 2022 08:28:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbiKYN2n (ORCPT ); Fri, 25 Nov 2022 08:28:43 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5005222B3; Fri, 25 Nov 2022 05:28:40 -0800 (PST) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NJbK00KBfzmWCs; Fri, 25 Nov 2022 21:28:04 +0800 (CST) Received: from dggpeml500006.china.huawei.com (7.185.36.76) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 25 Nov 2022 21:28:38 +0800 Received: from localhost.localdomain (10.175.112.70) by dggpeml500006.china.huawei.com (7.185.36.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 25 Nov 2022 21:28:37 +0800 From: Zhang Changzhong To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Julia Lawall , Pavel Cheblakov CC: Zhang Changzhong , , , Subject: [PATCH v2] can: sja1000: plx_pci: fix error handling path in plx_pci_add_card() Date: Fri, 25 Nov 2022 21:46:14 +0800 Message-ID: <1669383975-17332-1-git-send-email-zhangchangzhong@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500006.china.huawei.com (7.185.36.76) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If pci_iomap() or register_sja1000dev() fails, netdev will not be registered, but plx_pci_del_card() still deregisters the netdev. To avoid this, let's free the netdev and clear card->net_dev[i] before calling plx_pci_del_card(). In addition, add the missing pci_iounmap() when the channel does not exist. Compile tested only. Fixes: 951f2f960e5b ("drivers/net/can/sja1000/plx_pci.c: eliminate double f= ree") Fixes: 24c4a3b29255 ("can: add support for CAN interface cards based on the= PLX90xx PCI bridge") Signed-off-by: Zhang Changzhong --- v1->v2: switch to goto style fix. drivers/net/can/sja1000/plx_pci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/pl= x_pci.c index 5de1ebb..134a8cb 100644 --- a/drivers/net/can/sja1000/plx_pci.c +++ b/drivers/net/can/sja1000/plx_pci.c @@ -678,7 +678,7 @@ static int plx_pci_add_card(struct pci_dev *pdev, if (!addr) { err =3D -ENOMEM; dev_err(&pdev->dev, "Failed to remap BAR%d\n", cm->bar); - goto failure_cleanup; + goto failure_free_dev; } =20 priv->reg_base =3D addr + cm->offset; @@ -699,7 +699,7 @@ static int plx_pci_add_card(struct pci_dev *pdev, if (err) { dev_err(&pdev->dev, "Registering device failed " "(err=3D%d)\n", err); - goto failure_cleanup; + goto failure_iounmap; } =20 card->channels++; @@ -710,6 +710,7 @@ static int plx_pci_add_card(struct pci_dev *pdev, } else { dev_err(&pdev->dev, "Channel #%d not detected\n", i + 1); + pci_iounmap(pdev, priv->reg_base); free_sja1000dev(dev); card->net_dev[i] =3D NULL; } @@ -738,6 +739,11 @@ static int plx_pci_add_card(struct pci_dev *pdev, } return 0; =20 +failure_iounmap: + pci_iounmap(pdev, priv->reg_base); +failure_free_dev: + free_sja1000dev(dev); + card->net_dev[i] =3D NULL; failure_cleanup: dev_err(&pdev->dev, "Error: %d. Cleaning Up.\n", err); =20 --=20 2.9.5