From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752953AbbCWPfF (ORCPT ); Mon, 23 Mar 2015 11:35:05 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:24672 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827AbbCWPfA (ORCPT ); Mon, 23 Mar 2015 11:35:00 -0400 X-AuditID: cbfec7f4-b7f126d000001e9a-fb-551031f8e5f7 From: Krzysztof Kozlowski To: Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Dan Carpenter , Krzysztof Kozlowski Subject: [PATCH] HID: input: Fix NULL pointer dereference when power_supply_register fails Date: Mon, 23 Mar 2015 16:34:51 +0100 Message-id: <1427124891-30540-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsVy+t/xa7o/DAVCDb4fNLF4/W86i8WkJ++Z LSaunMxssXvOYhaL1y8MLW5++sZqcXnXHDaLz71HGC1O7y5x4PTYOesuu8fmFVoem1Z1snl8 fHqLxaNvyypGjzMLjrB7fN4kF8AexWWTkpqTWZZapG+XwJUxa8pW1oKFHBXfJ05ibGD8zNbF yMkhIWAisWbpbkYIW0ziwr31QHEuDiGBpYwSjy42MIEkhAT6mCR+zNIBsdkEjCU2L18C1iwi UCGx6fZ0RpAGZoF7jBKTnh0DSwgLxEj0/94J1swioCrx6ex+ZhCbV8BdYs2MxewQ2+QkTh6b zDqBkXsBI8MqRtHU0uSC4qT0XEO94sTc4tK8dL3k/NxNjJBA+rKDcfExq0OMAhyMSjy8EfX8 oUKsiWXFlbmHGCU4mJVEeOvVBEKFeFMSK6tSi/Lji0pzUosPMTJxcEo1MFarJkzI9rYPM52y akbB78v3I7Qec8n8ubDYKC0kfNtG761CYn5ZydpXi6dbvI0UlOAPZNR8H/yYUcJyAXdxSTZn ipy9vezuF6nOAZyphT3tF75483WWloewPJkTGH3noIDasZu+lmmshrKyi/SXcS3r6V38JdDj ynmDk0KT3B8zNa7VumavxFKckWioxVxUnAgA4E0C0wICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not call power_supply_powers() if power_supply_register() failed earlier. This fixes possible NULL pointer dereference by power_supply_powers() in such case. Signed-off-by: Krzysztof Kozlowski Reported-by: Dan Carpenter --- The patch was prepared on top of next-20150323. It depends on changes in power supply core (battery-2.6.git) so probably it should be applied to the battery tree. --- drivers/hid/hid-input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index a70fa4d7f8f9..008e89bf6f3c 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -452,10 +452,10 @@ static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type, kfree(psy_desc->name); kfree(psy_desc); dev->battery = NULL; + } else { + power_supply_powers(dev->battery, &dev->dev); } - power_supply_powers(dev->battery, &dev->dev); - out: return true; } -- 1.9.1