From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752507AbbJCMjg (ORCPT ); Sat, 3 Oct 2015 08:39:36 -0400 Received: from arrakis.dune.hu ([78.24.191.176]:33427 "EHLO arrakis.dune.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbbJCMjf (ORCPT ); Sat, 3 Oct 2015 08:39:35 -0400 Subject: Re: [PATCH 1/3] net: dsa: Use devm_ prefixed allocations To: Neil Armstrong , Sergei Shtylyov , "David S. Miller" , Jesper Dangaard Brouer References: <560E60E4.8020706@baylibre.com> <560E86BC.3090104@cogentembedded.com> <560E86F5.2030301@baylibre.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org From: Felix Fietkau Message-ID: <560FCC76.3060705@openwrt.org> Date: Sat, 3 Oct 2015 14:39:18 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <560E86F5.2030301@baylibre.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2015-10-02 15:30, Neil Armstrong wrote: > On 10/02/2015 03:29 PM, Sergei Shtylyov wrote: >> On 10/2/2015 1:48 PM, Neil Armstrong wrote: >> >>> To simplify and prevent memory leakage when unbinding, use >>> the devm_ memory allocation calls. >>> >>> Tested-by: Andrew Lunn >>> Tested-by: Florian Fainelli >>> Signed-off-by: Neil Armstrong >>> --- >>> net/dsa/dsa.c | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c >>> index c59fa5d..98f94c2 100644 >>> --- a/net/dsa/dsa.c >>> +++ b/net/dsa/dsa.c >>> @@ -305,7 +305,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) >>> if (ret < 0) >>> goto out; >>> >>> - ds->slave_mii_bus = mdiobus_alloc(); >>> + ds->slave_mii_bus = devm_mdiobus_alloc(parent); >>> if (ds->slave_mii_bus == NULL) { >>> ret = -ENOMEM; >>> goto out; >>> @@ -400,7 +400,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, >>> /* >>> * Allocate and initialise switch state. >>> */ >>> - ds = kzalloc(sizeof(*ds) + drv->priv_size, GFP_KERNEL); >>> + ds = devm_kzalloc(parent, sizeof(*ds) + drv->priv_size, GFP_KERNEL); >>> if (ds == NULL) >>> return ERR_PTR(-ENOMEM); >>> >>> @@ -883,7 +883,7 @@ static int dsa_probe(struct platform_device *pdev) >>> goto out; >>> } >>> >>> - dst = kzalloc(sizeof(*dst), GFP_KERNEL); >>> + dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL); >>> if (dst == NULL) { >>> dev_put(dev); >>> ret = -ENOMEM; >>> >> >> Shouldn't you remove the correspoding kfree(), etc. calls? >> >> MBR, Sergei >> > The corresponding kfree() calls were all missing. Not in the error handling path. mdiobus_alloc has a corresponding mdiobus_free in the same function. The ds kzalloc in dsa_switch_setup has a kfree in dsa_switch_setup_one. - Felix