From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754345AbbBTNFT (ORCPT ); Fri, 20 Feb 2015 08:05:19 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:57188 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010AbbBTNFB (ORCPT ); Fri, 20 Feb 2015 08:05:01 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-6b-54e73069d62f From: Krzysztof Kozlowski To: Cezary Jackiewicz , Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Guenter Roeck , Matthew Garrett , Krzysztof Kozlowski , stable@vger.kernel.org Subject: [RFT PATCH v2 2/2] compal-laptop: Check return value of power_supply_register Date: Fri, 20 Feb 2015 14:04:40 +0100 Message-id: <1424437480-22364-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1424437480-22364-1-git-send-email-k.kozlowski@samsung.com> References: <1424437480-22364-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNJMWRmVeSWpSXmKPExsVy+t/xK7qZBs9DDFZd1bRYcqKbxaJroYHF 6xeGFpd3zWGzeLLwDJPFx082Fqv3vGC2WLDxEaMDh8fOWXfZPTav0PJYeKWZyWPn9wZ2j74t qxg9Pm+SC2CL4rJJSc3JLEst0rdL4MrY8vgqY8Et3oqH61czNjCe5+5i5OCQEDCROHM2uYuR E8gUk7hwbz1bFyMXh5DAUkaJvjNrWSGcPiaJoy8msYNUsQkYS2xevgSsSkRgHqPEpEdfwRxm gfmMEhNO/2MGqRIWiJCY8GAXC4jNIqAq0fr0ASvIOl4Bd4njZ+oh1slJnDw2mRXE5hTwkDg+ 7y8LSIkQUMntzyITGHkXMDKsYhRNLU0uKE5KzzXUK07MLS7NS9dLzs/dxAgJsC87GBcfszrE KMDBqMTD+2PPsxAh1sSy4srcQ4wSHMxKIryeCs9DhHhTEiurUovy44tKc1KLDzEycXBKNTCq c01dnqYhn7c/5UeS6/6FDhMXfVnMEpTefPDUmY661LsbI6+qVPbem8yffaxyWmXBFy5WO8sr X291/9zT4BdSt+ng/V3Pv7y77JYf9UbdbPfamENzJz57LFn6JKdFJa+mIaPkM+9t5j8Jcv8n rMi16txfYxDx2bDy6OzCGRnXJ6mefmAndiFJiaU4I9FQi7moOBEAQGbR3g4CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The return value of power_supply_register() call was not checked and even on error probe() function returned 0. If registering failed then during unbind the driver tried to unregister power supply which was not actually registered. This could lead to memory corruption because power_supply_unregister() unconditionally cleans up given power supply. Fix this by checking return status of power_supply_register() call. In case of failure, clean up sysfs entries and fail the probe. Signed-off-by: Krzysztof Kozlowski Fixes: 9be0fcb5ed46 ("compal-laptop: add JHL90, battery & hwmon interface") Cc: --- Changes since v1: 1. Don't unregister hwmon device because previous patch solves this by using devm-like function. --- drivers/platform/x86/compal-laptop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index eb9885e7fb0e..8455d50a5639 100644 --- a/drivers/platform/x86/compal-laptop.c +++ b/drivers/platform/x86/compal-laptop.c @@ -1036,7 +1036,9 @@ static int compal_probe(struct platform_device *pdev) /* Power supply */ initialize_power_supply_data(data); - power_supply_register(&compal_device->dev, &data->psy); + err = power_supply_register(&compal_device->dev, &data->psy); + if (err < 0) + goto remove; platform_set_drvdata(pdev, data); @@ -1072,6 +1074,7 @@ static int compal_remove(struct platform_device *pdev) data = platform_get_drvdata(pdev); power_supply_unregister(&data->psy); + /* FIXME: missing hwmon_device_unregister() */ sysfs_remove_group(&pdev->dev.kobj, &compal_platform_attr_group); -- 1.9.1