From patchwork Mon Feb 11 11:28:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Malat X-Patchwork-Id: 219584 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CAB2E2C02F3 for ; Mon, 11 Feb 2013 22:25:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754991Ab3BKLZF (ORCPT ); Mon, 11 Feb 2013 06:25:05 -0500 Received: from mail-ee0-f49.google.com ([74.125.83.49]:39853 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754750Ab3BKLZE (ORCPT ); Mon, 11 Feb 2013 06:25:04 -0500 Received: by mail-ee0-f49.google.com with SMTP id d4so3108587eek.8 for ; Mon, 11 Feb 2013 03:25:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent:x-gm-message-state; bh=/55J4jOlFiG2mCgIl7G2Nm15OrRYJPpoqb71+402Yok=; b=nGhOpNg0gyuXZzrk26gypTftpgJb5FEqrB54PdyceyHTKr1YOUypoVfz/T4YE4Sz8N d41RhuIlxhbrf4mlGFC9Koio9qBEWMK5WO8RKkBXbsNN1ba6JMcEeRK0O0QiocmycGYg ZnsvKmbrht1DmWNSdpKtOtuKZduTHeiA4kZLipJ0M/2e0F6ZTvSPmBmb+AUQbSrQHeMc Jben52NA4bfkNfeWGstixBHplwC7lKPMZknuWpXKkw+5VjpWF0/GxM+EIOE2+7VSedlf mqMBAHyk81hEDwlzC7IbA6WxpOuz3c6/xfiWn0JfH0K/MHA+DbpEwY5ggZG4OW2L2dXj 2fjQ== X-Received: by 10.14.182.5 with SMTP id n5mr48815865eem.9.1360581900411; Mon, 11 Feb 2013 03:25:00 -0800 (PST) Received: from bordel.klfree.net (bordel.klfree.cz. [81.201.48.42]) by mx.google.com with ESMTPS id j46sm58562121eeo.3.2013.02.11.03.24.58 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 Feb 2013 03:24:59 -0800 (PST) Date: Mon, 11 Feb 2013 12:28:27 +0100 From: Petr Malat To: netdev@vger.kernel.org Cc: oss@malat.biz Subject: [PATCH] phy: fix phy_device_free memory leak Message-ID: <20130211112827.GA24817@bordel.klfree.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Gm-Message-State: ALoCoQnSyDNaNJPeLGfJxi2uz84BEcmE/VPLRS7FzQh+epcbY0rDSyN6kl61sMB37D4E5qzEPOoW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Malat Fix memory leak in phy_device_free() for the case when phy_device* returned by phy_device_create() is not registered in the system. Signed-off-by: Petr Malat --- Bug description: phy_device_create() sets name of kobject using dev_set_name(), which allocates memory using kvasprintf(), but this memory isn't freed if the underlying device isn't registered properly, because kobject_cleanup() is not called in that case. This can happen (and actually is happening on our machines) if phy_device_register(), called by mdiobus_scan(), fails. Patch description: Name is freed by phy_device_free(). In the case a device is released trough kobject_cleanup()->device_release()->phy_device_release(), the name is set to NULL and it is not freed by phy_device_free(), because it will be freed later by kobject_cleanup(). Please put me on CC, I'm not signed into the mailing list. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-v2.6.32.60.orig/drivers/net/phy/phy_device.c 2013-02-06 19:44:11.000000000 +0100 +++ linux-v2.6.32.60/drivers/net/phy/phy_device.c 2013-02-06 20:56:57.000000000 +0100 @@ -41,12 +41,16 @@ MODULE_LICENSE("GPL"); void phy_device_free(struct phy_device *phydev) { + kfree(phydev->dev.kobj.name); kfree(phydev); } EXPORT_SYMBOL(phy_device_free); static void phy_device_release(struct device *dev) { + /* Name will be freed by kobject_cleanup() */ + dev->kobj.name = NULL; + phy_device_free(to_phy_device(dev)); }