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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 C7423C433E0 for ; Wed, 29 Jul 2020 03:02:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 95CC92078E for ; Wed, 29 Jul 2020 03:02:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2a+r92sJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95CC92078E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ooxm1pw+tMNfT9Fpa+plGlJcb1nNv3DxUOMu/sJEtk0=; b=2a+r92sJwGHdPnsOMdH2ZfGrPw 0UOFhnkaHzqIB8wKZmLoZf/QF0wRnFRvhXhbQG1+HpPyy9Pbzqh7lXtaHwEa2ioXd/WqJIdwdfiA0 qRLE67gtE0cCJKFjQQ3+HPkWU7w9DJyi2YnwP7TohSFbY5oWWH0pppSPc/tGZE5bX82yGzEZ3qujB 2/Vu8VBG3Gw2e4JxXqBaIzBr+Ai3UmzK+GYVFW7TWQXBJ1v1LoFqcr0wJywX9k2ZWReO3tCdFC2Ax Q5tmUCZ4xhWznKRiX7Nx20LXqejPm667KQAb1ECM1RNb+DVUhpYl0W7fdXTdwqA4TtUH3+tlybYJn 254nbxFA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0cKn-0000iX-CB; Wed, 29 Jul 2020 03:00:49 +0000 Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0cKj-0000hN-8T for linux-arm-kernel@lists.infradead.org; Wed, 29 Jul 2020 03:00:47 +0000 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 20DF341D5DD887D6225E; Wed, 29 Jul 2020 11:00:33 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Wed, 29 Jul 2020 11:00:29 +0800 From: Lu Wei To: , , , , , , , Subject: [PATCH] net: ethernet: fix potential memory leak in gemini_ethernet_port_probe() Date: Wed, 29 Jul 2020 11:46:06 +0800 Message-ID: <20200729034606.89041-1-luwei32@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200728_230046_547511_292C8F94 X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If some processes in gemini_ethernet_port_probe() fail, free_netdev(dev) needs to be called to avoid a memory leak. Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Reported-by: Hulk Robot Signed-off-by: Lu Wei --- drivers/net/ethernet/cortina/gemini.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 8d13ea370db1..5e93a1a570b6 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -2407,37 +2407,48 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!dmares) { dev_err(dev, "no DMA resource\n"); + free_netdev(netdev); return -ENODEV; } port->dma_base = devm_ioremap_resource(dev, dmares); - if (IS_ERR(port->dma_base)) + if (IS_ERR(port->dma_base)) { + free_netdev(netdev); return PTR_ERR(port->dma_base); + } /* GMAC config memory */ gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (!gmacres) { dev_err(dev, "no GMAC resource\n"); + free_netdev(netdev); return -ENODEV; } port->gmac_base = devm_ioremap_resource(dev, gmacres); - if (IS_ERR(port->gmac_base)) + if (IS_ERR(port->gmac_base)) { + free_netdev(netdev); return PTR_ERR(port->gmac_base); + } /* Interrupt */ irq = platform_get_irq(pdev, 0); - if (irq <= 0) + if (irq <= 0) { + free_netdev(netdev); return irq ? irq : -ENODEV; + } port->irq = irq; /* Clock the port */ port->pclk = devm_clk_get(dev, "PCLK"); if (IS_ERR(port->pclk)) { dev_err(dev, "no PCLK\n"); + free_netdev(netdev); return PTR_ERR(port->pclk); } ret = clk_prepare_enable(port->pclk); - if (ret) + if (ret) { + free_netdev(netdev); return ret; + } /* Maybe there is a nice ethernet address we should use */ gemini_port_save_mac_addr(port); @@ -2446,6 +2457,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) port->reset = devm_reset_control_get_exclusive(dev, NULL); if (IS_ERR(port->reset)) { dev_err(dev, "no reset\n"); + free_netdev(netdev); return PTR_ERR(port->reset); } reset_control_reset(port->reset); @@ -2501,8 +2513,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) IRQF_SHARED, port_names[port->id], port); - if (ret) + if (ret) { + free_netdev(netdev); return ret; + } ret = register_netdev(netdev); if (!ret) { -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel