From 096fc160b706237b6643a15a8e13690de238af0f Mon Sep 17 00:00:00 2001 From: Christophe JAILLET Date: Mon, 7 Aug 2017 00:37:55 +0200 Subject: power: supply: charger-manager: Fix a NULL pointer dereference in 'charger_manager_probe()' 'devm_kzalloc()' can return NULL. Return -ENOMEM in this case in order to avoid a NULL pointer dereference later on. Signed-off-by: Christophe JAILLET Signed-off-by: Sebastian Reichel --- drivers/power/supply/charger-manager.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/power/supply') diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c index adc3761831e1..52a49857e20f 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1645,6 +1645,8 @@ static int charger_manager_probe(struct platform_device *pdev) /* Initialize alarm timer */ if (alarmtimer_get_rtcdev()) { cm_timer = devm_kzalloc(cm->dev, sizeof(*cm_timer), GFP_KERNEL); + if (!cm_timer) + return -ENOMEM; alarm_init(cm_timer, ALARM_BOOTTIME, cm_timer_func); } -- cgit