From patchwork Fri Sep 11 12:46:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 264047 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=-12.8 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=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 D12F2C433E2 for ; Fri, 11 Sep 2020 17:24:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 883DF221ED for ; Fri, 11 Sep 2020 17:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599845069; bh=p6uNEAiri0OzZ1/93DJ8TG7PHf9aP2bTZ9/fkANWS+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TGtitJ/CED7g2goi6qFjGc84FTXhov7E4YPqmHsg27r1gNMgfTuJTFMLWrMKInYJo prdleJViTdbyLRWeg6x/CISY4vlC7Rm3sKBCXFw3PGe8ybyJJl8eFyHvs/M0592s00 4SfOwWVEMytYcpOWe4hspnA+76NmdiTcDwe4gyIA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726187AbgIKRY0 (ORCPT ); Fri, 11 Sep 2020 13:24:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:49906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726131AbgIKNAK (ORCPT ); Fri, 11 Sep 2020 09:00:10 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A862D2226B; Fri, 11 Sep 2020 12:56:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599828984; bh=p6uNEAiri0OzZ1/93DJ8TG7PHf9aP2bTZ9/fkANWS+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dtIucj3oT+uGOUyKrsmjO3eHGI0wnfDvIrph9x32EzR6KjODliT92FgTt10PR3tIL OguleYa+I1ndlGerWxDKLNOVBMZVECGn9AHFSMdta3DRfiq0uCyOH3db5U6bYVMhdd mkoztpB+fEytdUpFyBJBhFAkqmgWA35mdIlGZiwo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 20/71] net: arc_emac: Fix memleak in arc_mdio_probe Date: Fri, 11 Sep 2020 14:46:04 +0200 Message-Id: <20200911122505.949211751@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911122504.928931589@linuxfoundation.org> References: <20200911122504.928931589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dinghao Liu [ Upstream commit e2d79cd8875fa8c3cc7defa98a8cc99a1ed0c62f ] When devm_gpiod_get_optional() fails, bus should be freed just like when of_mdiobus_register() fails. Fixes: 1bddd96cba03d ("net: arc_emac: support the phy reset for emac driver") Signed-off-by: Dinghao Liu Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/arc/emac_mdio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/arc/emac_mdio.c b/drivers/net/ethernet/arc/emac_mdio.c index a22403c688c95..337cfce78aef2 100644 --- a/drivers/net/ethernet/arc/emac_mdio.c +++ b/drivers/net/ethernet/arc/emac_mdio.c @@ -152,6 +152,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv) if (IS_ERR(data->reset_gpio)) { error = PTR_ERR(data->reset_gpio); dev_err(priv->dev, "Failed to request gpio: %d\n", error); + mdiobus_free(bus); return error; }