Skip to content

Commit

Permalink
compal-laptop: Check return value of power_supply_register
Browse files Browse the repository at this point in the history
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 <k.kozlowski@samsung.com>
Fixes: 9be0fcb ("compal-laptop: add JHL90, battery & hwmon interface")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
  • Loading branch information
Krzysztof Kozlowski authored and Sebastian Reichel committed Mar 13, 2015
1 parent ad77470 commit 1915a71
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/platform/x86/compal-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 1915a71

Please sign in to comment.