From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1483324-1517681323-2-10999195864709129399 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517681323; b=IDqafHhNMbE64eRJq2v4POQ/eTiGeMCY8TMSRvXvjiDSDjv tpXodpW60xOsXwlRhpMFCgw9vYMEcFESqc3YEJHf8NLd+OeyFODksJKa8ueIXnpL 1Iq5SZx7plXAgKwduhX476MSIGMYscbgj4WM/nXOe6NzZgknaP3HEvCqrEjEwTnp H2hcVtVJ3ZrSTGX0O41Y/0L7R74Nq6MSnvkX+wk+fAZzMUWcoE7nTnwOTMJPd18c spayWyYwjlfxhFAkGlSz69vMcdHJu7b1eE7zIvz2VbWJr5DZU1JFp1lWB7zHEu1E KfkNhYApfH0Jn6rqe5ENC3xwuEkaZeXmOjGEekA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517681323; bh=HpWQwu oNP66PPGsCkuET1GrDySijF3HOvlijpUnb/Q0=; b=gwJXgXPTMnJZfZmRrGY/qx XcLrzBjZ7GQeXWD2Xd9O/i1QeXOKEaN42ZEzBzR72zB8yBdILO0f1zVBDMx8BmWx ks9sNrwc/6Y402NXNA7fmlTpm03AzwOE6dSwNGMcG/RBIEM0ohMYMFjUmR5511V8 fMd0gj9kg1WsS2oh2MnipsYwOBlXxWMMiV2x5FfMxSE91etdGu+dZpg7a84Adysp 1JzI+O8CXBIfYIbgSLSjdx8rzV1Wd2Duh3wKf6YWN3R1Gg/rN8QkgtjvxHeI0DWt Gn6EYF0JDBuxw0LTIdt6if1onO3r915ltSUnh/ajW40e7niWA9wg8I4E8JeLV+Rw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=lrAzIyf9 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=lrAzIyf9 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbeBCSIk (ORCPT ); Sat, 3 Feb 2018 13:08:40 -0500 Received: from mail-bl2nam02on0113.outbound.protection.outlook.com ([104.47.38.113]:13185 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752714AbeBCSHf (ORCPT ); Sat, 3 Feb 2018 13:07:35 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Christophe JAILLET , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 19/24] mdio-sun4i: Fix a memory leak Thread-Topic: [PATCH AUTOSEL for 3.18 19/24] mdio-sun4i: Fix a memory leak Thread-Index: AQHTnRmGOYBCYGodUU6DqkgTfIywmg== Date: Sat, 3 Feb 2018 18:05:08 +0000 Message-ID: <20180203180444.10801-19-alexander.levin@microsoft.com> References: <20180203180444.10801-1-alexander.levin@microsoft.com> In-Reply-To: <20180203180444.10801-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BL0PR2101MB0993;7:VyMcaZ2Ea0/iIWFkR1Up8Oq0thMhnFB3eh5B6CU1RmD4h98VWYqHy6O8FpAdTJctb3i6ntONF/1OvJPqNGqAvrhEqYSF9NOLpzOOwbF210H/9q//wZOGk5mIiEayRsk809I7lF9CHhBkrYp1VEqD9WlPjaM7OjK+bj0iHMOx6C6sjRQ27QvTQ9xCmBXEqwJZ+OpVuxB9AcYuAXTDACCeI3qEHZ8vZ9ZOUtx9YiYz99To0RXvB2ByWYkpPPf+gM8b x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2b84dc1b-cbcf-4119-78d7-08d56b30e2e7 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:BL0PR2101MB0993; x-ms-traffictypediagnostic: BL0PR2101MB0993: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(155761271638844); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(2400082)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:BL0PR2101MB0993;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB0993; x-forefront-prvs: 05724A8921 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39380400002)(39860400002)(376002)(366004)(396003)(189003)(199004)(6436002)(186003)(3660700001)(8936002)(105586002)(2906002)(6346003)(6116002)(3280700002)(3846002)(97736004)(6486002)(1076002)(2950100002)(6666003)(81156014)(86362001)(76176011)(102836004)(2501003)(5250100002)(26005)(68736007)(10090500001)(81166006)(8676002)(59450400001)(53936002)(5660300001)(22452003)(305945005)(107886003)(7736002)(4326008)(86612001)(36756003)(99286004)(316002)(6512007)(10290500003)(72206003)(6506007)(14454004)(478600001)(25786009)(106356001)(2900100001)(54906003)(110136005)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB0993;H:BL0PR2101MB1027.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: xH5HYBjo1pXkmI1p3Am5ctkWlY+vipv3C7OUXKSHcq9tZQzO1nRp7VDra7kCdNKRaD29vwO32T5Eku9k9oE3hg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b84dc1b-cbcf-4119-78d7-08d56b30e2e7 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2018 18:05:08.5652 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB0993 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Christophe JAILLET [ Upstream commit 56c0290202ab94a2f2780c449395d4ae8495fab4 ] If the probing of the regulator is deferred, the memory allocated by 'mdiobus_alloc_size()' will be leaking. It should be freed before the next call to 'sun4i_mdio_probe()' which will reallocate it. Fixes: 4bdcb1dd9feb ("net: Add MDIO bus driver for the Allwinner EMAC") Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/mdio-sun4i.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c index 15bc7f9ea224..afd76e07088b 100644 --- a/drivers/net/phy/mdio-sun4i.c +++ b/drivers/net/phy/mdio-sun4i.c @@ -128,8 +128,10 @@ static int sun4i_mdio_probe(struct platform_device *pd= ev) =20 data->regulator =3D devm_regulator_get(&pdev->dev, "phy"); if (IS_ERR(data->regulator)) { - if (PTR_ERR(data->regulator) =3D=3D -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(data->regulator) =3D=3D -EPROBE_DEFER) { + ret =3D -EPROBE_DEFER; + goto err_out_free_mdiobus; + } =20 dev_info(&pdev->dev, "no regulator found\n"); } else { --=20 2.11.0