From patchwork Mon Feb 23 11:47:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 5864641 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 66A37BF6C3 for ; Mon, 23 Feb 2015 11:53:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 669F820219 for ; Mon, 23 Feb 2015 11:53:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B2AA20615 for ; Mon, 23 Feb 2015 11:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753192AbbBWLxW (ORCPT ); Mon, 23 Feb 2015 06:53:22 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:49176 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752492AbbBWLsQ (ORCPT ); Mon, 23 Feb 2015 06:48:16 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NK800KKS3N0XMA0@mailout4.w1.samsung.com>; Mon, 23 Feb 2015 11:52:12 +0000 (GMT) X-AuditID: cbfec7f4-b7f126d000001e9a-0b-54eb12ec9d16 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 2A.5A.07834.CE21BE45; Mon, 23 Feb 2015 11:45:48 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NK8001843FJ0A90@eusync2.samsung.com>; Mon, 23 Feb 2015 11:48:13 +0000 (GMT) From: Krzysztof Kozlowski To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Len Brown , Jiri Kosina , David Herrmann , Cezary Jackiewicz , Darren Hart , Support Opensource , Milo Kim , Julian Andres Klode , Marc Dietrich , Greg Kroah-Hartman , linux-acpi@vger.kernel.org, linux-input@vger.kernel.org, platform-driver-x86@vger.kernel.org, patches@opensource.wolfsonmicro.com, ac100@lists.launchpad.net, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org, Linus Walleij , Samuel Ortiz , Lee Jones , linux-arm-kernel@lists.infradead.org, Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: Thomas Gleixner , Pavel Machek , Kyungmin Park , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH v4 12/20] power_supply: Add power_supply_put for decrementing device reference counter Date: Mon, 23 Feb 2015 12:47:33 +0100 Message-id: <1424692061-30624-13-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1424692061-30624-1-git-send-email-k.kozlowski@samsung.com> References: <1424692061-30624-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAy2RaUiTcRzH++85J60e5tGTpS8seyHlUVK/wqKD8gF9USEEJubSeYDn5maG lBhCTuddwdA0Zs4jr4nhnS215rzSEE2dlRY2j7wKj9Q8evf9fvh8+b340ZiwCbemQ8KjxZJw UagdaYYbNt5/OjEtnPJy7m5kILVrjgcFH5JxSFg34ZA58QuDxs5VCtT9VqB44QwZxVkYPFJX kNBbfgaeVh2Awvk8Ehpy1DhMTbpAV8I0BWO/2xDUfZ0hIfuvhgea5jQE2vEBAoYW/hDQX59D wqKyFUHSkoqEstZRCpJ6XiDQrJbj0NeSv7WY2SRhtKONhNLGSQw6DX0EqKbNwZBMgKEhGpoS P2JQrX2CwXLlOHHxGFe04MQZm9/hXFr5IsHVqUYpbm7el/uenkVx1UUO3IRJQ3DakiSSGxlo JLnZ7m6Ke66/wb3JfbUlFDzk2lJGcO5nxhp5/aC3mVuAODRELpY4XfAzC06o7cQiN23v1Ywu UvEoxVqB+DTLuLLaGiO2m63YXmMFqUBmtJB5idhilY63W1J5bOpcD9q2SOYUW60p2LEsmHY+ +7ZMuWNhTB9ixyf01LZlzgSzle1FOwucsWfr9U34dhYwHKv/ofx/z5bVt2cRCkTT/C0+9lq+ jYWMO6usykbpSJCP9pQgS7HMP1J6NyjMxVEqCpPKwoMc/SPCtGj35Uu1SN1+TocYGtntFXyR m7yEhEgujQ3TIZbG7CwEh1a2kCBAFHtfLIm4I5GFiqU6xKP51vGopDNm0CSwvQmylbgrD5wq Io+6Lsv9Jz1CBVbDa5Yxt6pyLA6b3PWCHntf7yPsuiyq5bFi/8k6j5FcH8/j+zZO+1FGX4gq dVTJhJXXZlLOxtk8u6xM5CvPDwlvD+d1fG5T2lzF7XX5EVnGzACrLp9Bz0D7b/ilwnw8MMrg 5jFrh0uDRS4OmEQq+gdZBEOY0AIAAA== Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The power_supply_get_by_phandle() and power_supply_get_by_name() use function class_find_device() for obtaining the reference to power supply. Each use of class_find_device() increases the power supply's device reference counter. However the reference counter was not decreased by users of this API. Thus final device_unregister() call from power_supply_unregister() could not release the device and clean up its resources. This lead to memory leak if at least once power_supply_get_by_*() was called between registering and unregistering the power supply. Add and document new API power_supply_put() for decrementing the reference counter. Signed-off-by: Krzysztof Kozlowski Acked-by: Pavel Machek Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Sebastian Reichel --- drivers/power/power_supply_core.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/power_supply.h | 1 + 2 files changed, 39 insertions(+) diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 7f437f66076c..a94f8c9d5e1e 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -336,6 +336,17 @@ static int power_supply_match_device_by_name(struct device *dev, const void *dat return strcmp(psy->desc->name, name) == 0; } +/** + * power_supply_get_by_name() - Search for a power supply and returns its ref + * @name: Power supply name to fetch + * + * If power supply was found, it increases reference count for the + * internal power supply's device. The user should power_supply_put() + * after usage. + * + * Return: On success returns a reference to a power supply with + * matching name equals to @name, a NULL otherwise. + */ struct power_supply *power_supply_get_by_name(const char *name) { struct device *dev = class_find_device(power_supply_class, NULL, name, @@ -345,12 +356,39 @@ struct power_supply *power_supply_get_by_name(const char *name) } EXPORT_SYMBOL_GPL(power_supply_get_by_name); +/** + * power_supply_put() - Drop reference obtained with power_supply_get_by_name + * @psy: Reference to put + * + * The reference to power supply should be put before unregistering + * the power supply. + */ +void power_supply_put(struct power_supply *psy) +{ + might_sleep(); + + put_device(&psy->dev); +} +EXPORT_SYMBOL_GPL(power_supply_put); + #ifdef CONFIG_OF static int power_supply_match_device_node(struct device *dev, const void *data) { return dev->parent && dev->parent->of_node == data; } +/** + * power_supply_get_by_phandle() - Search for a power supply and returns its ref + * @np: Pointer to device node holding phandle property + * @phandle_name: Name of property holding a power supply name + * + * If power supply was found, it increases reference count for the + * internal power supply's device. The user should power_supply_put() + * after usage. + * + * Return: On success returns a reference to a power supply with + * matching name equals to value under @property, NULL or ERR_PTR otherwise. + */ struct power_supply *power_supply_get_by_phandle(struct device_node *np, const char *property) { diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 54ebac5e3fe3..7000a4927ac8 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -282,6 +282,7 @@ extern struct atomic_notifier_head power_supply_notifier; extern int power_supply_reg_notifier(struct notifier_block *nb); extern void power_supply_unreg_notifier(struct notifier_block *nb); extern struct power_supply *power_supply_get_by_name(const char *name); +extern void power_supply_put(struct power_supply *psy); #ifdef CONFIG_OF extern struct power_supply *power_supply_get_by_phandle(struct device_node *np, const char *property);