From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754570AbbBTNNu (ORCPT ); Fri, 20 Feb 2015 08:13:50 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:51845 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754082AbbBTNNr (ORCPT ); Fri, 20 Feb 2015 08:13:47 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-cb-54e73278f68e 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 v3 2/2] compal-laptop: Check return value of power_supply_register Date: Fri, 20 Feb 2015 14:13:35 +0100 Message-id: <1424438015-3006-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1424438015-3006-1-git-send-email-k.kozlowski@samsung.com> References: <1424438015-3006-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDJMWRmVeSWpSXmKPExsVy+t/xa7oVRs9DDKa8kbNYcqKbxaJroYHF 6xeGFpd3zWGzeLLwDJPFx082Fqv3vGC2WLDxEaMDh8fOWXfZPTav0PJYeKWZyWPn9wZ2j74t qxg9Pm+SC2CL4rJJSc3JLEst0rdL4MqY0v6aveAld8WveetYGxj/cHYxcnJICJhI/D27gg3C FpO4cG89mC0ksJRRouelVxcjF5DdxyTRduE3WIJNwFhi8/IlbCAJEYF5jBKTHn0Fc5gF5jNK TDj9jxmkSlggQmLaz5dMIDaLgKrEh8/PWEFsXgE3ifZjd1kg1slJnDw2GSzOKeAucenVaSCb A2idm8Se76kTGHkXMDKsYhRNLU0uKE5KzzXUK07MLS7NS9dLzs/dxAgJsS87GBcfszrEKMDB qMTD+2PPsxAh1sSy4srcQ4wSHMxKIryeCs9DhHhTEiurUovy44tKc1KLDzEycXBKNTCK6V/d 99uu2/Oq8xEOvtr5J832Hqo5/yPoj02/9qu9ynvEz/zqS97sE/vva+StOYsimxednCX+4Ldp q2RA+lmHvQIrvzxvmtHuKztfMeJMac1bnWvd1yesPxK1pmbOBoeyOU25z/J1J5xab3droRHD VtuU26qrdYyevgnlDOdxu+tnZTu7+qapEktxRqKhFnNRcSIAKY+lHw8CAAA= 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 v2: 1. Remove FIXME note. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index eb9885e7fb0e..bceb30b539f3 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); -- 1.9.1