diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-03-23 16:34:51 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-03-24 13:38:16 +0100 |
| commit | fbea947c7d122f4704001fac2a96b617f767037a (patch) | |
| tree | 3b5edfdd2c0d942317d88b3d90cacd9b8395dfda /drivers/hid/hid-input.c | |
| parent | 8fb0885504cc029bd48877fa89ba91c33c0110b5 (diff) | |
| download | lwn-fbea947c7d122f4704001fac2a96b617f767037a.tar.gz lwn-fbea947c7d122f4704001fac2a96b617f767037a.zip | |
HID: input: Fix NULL pointer dereference when power_supply_register fails
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 <k.kozlowski@samsung.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 5d5a8c42645f..32c2da49bd5b 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; } |