Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp784981ybg; Tue, 28 Jul 2020 20:03:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnu2Zrb39kEF8JHKBa/5tVWHUBX7D37acMV0yLepSlRVFx3lg9rBN0OYf6IgFjFFVwAwdX X-Received: by 2002:aa7:c697:: with SMTP id n23mr3223425edq.50.1595991780869; Tue, 28 Jul 2020 20:03:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595991780; cv=none; d=google.com; s=arc-20160816; b=b/JBUsuzUB+0ovXXsqdKzF8imhIQyFVasQTjfGmdszMW6fXydDAX1Ki1qI3icaTDsE 6B+u0aqGo5pC6gCupJMrJZSoNdL1IxHkpcw5nSoeY56jd2mjU6cgJJyWCZxPxIqQ9sTX KqoMr7m53BprFvAYqzrOGo/OVMKo5DkKGoGBtfEE5tRgKdd0nwmVPzv9hSSZR9uCjrMN 7hriv8ijS9NzI8VTbduS06XMvr2v/uSBxtJ/8jGA3mJyY2y8hzoZLUFVza0y+wKCFYKi mYdJoohDAi9LbmRWuBYQq2NQKFDWynI1reCcDAj8/7Kdqgjh1HxRjhCJuUuAUJEhCfEd 2TFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:to :from; bh=v5vQ4LT5fV4YQOxl2jr9RQeHCtSO+F3NZckGLEDIzCM=; b=BBAP6gMPaRa+b51BJe7sve0/4INEOQfFNrhcGBs+HmqZvToHt/DaeC8ROkTuGX+pGN PtUDM+NjIfAtLXjHEsHnLw/E2fYJZPAVuxZml6mYkMziO+sFT6hhcASvqWy6a/7rN30v WHi43JJQPKaDC6/1D+Dji/nG0nZzhqz+Jef50t58G9LRb+83TSMCCeC18XeheqFN8LXS u/rSuCL86TVZORda8ms6WclueQKJVzNYCuIs3B1nnpRwqBKPpbidv+UPYuTqEC8G98w7 VKGvUclQebgPTF+K399tXYUqfBWgKUiNNZgjs4wo2pDYxrYn7GtIC6gtUHERmNEWooQK P3mw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o18si251909ejg.391.2020.07.28.20.02.38; Tue, 28 Jul 2020 20:03:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731153AbgG2DAf (ORCPT + 99 others); Tue, 28 Jul 2020 23:00:35 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:8847 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728401AbgG2DAf (ORCPT ); Tue, 28 Jul 2020 23:00:35 -0400 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 Content-Type: text/plain X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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