From: Colin Ian King <colin.king@canonical.com>
Date: Fri, 3 Apr 2020 12:04:37 +0100
Subject: rtc: ds1307: check for failed memory allocation on wdt
Git-commit: 1821b79d6a7d6973d1630e71380da8bb5e95f3a5
Patch-mainline: v5.7-rc1
References: jsc#SLE-12251
Currently a failed memory allocation will lead to a null pointer
dereference on point wdt. Fix this by checking for a failed
allocation and just returning.
Addresses-Coverity: ("Dereference null return")
Fixes: fd90d48db037 ("rtc: ds1307: add support for watchdog timer on ds1388")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20200403110437.57420-1-colin.king@canonical.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
---
drivers/rtc/rtc-ds1307.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index fad042118862..49702942bb08 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1673,6 +1673,8 @@ static void ds1307_wdt_register(struct ds1307 *ds1307)
return;
wdt = devm_kzalloc(ds1307->dev, sizeof(*wdt), GFP_KERNEL);
+ if (!wdt)
+ return;
wdt->info = &ds1388_wdt_info;
wdt->ops = &ds1388_wdt_ops;
--
2.26.2