Commit fbea947c authored Mar 23, 2015 by Krzysztof Kozlowski Committed by Sebastian Reichel Mar 24, 2015

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>

parent 8fb08855

drivers/hid/hid-input.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -452,9 +452,9 @@ 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);
		}

		out:
		return true;