linux-kernel - AW: [PATCH][next] rtc: ds1307: check for failed memory allocation on wdt

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <54a09b5502ee45e9a926a025ae576498@bfs.de>
Date:   Thu, 2 Apr 2020 13:40:49 +0000
From:   Walter Harms <wharms@....de>
To:     Colin King <colin.king@...onical.com>,
        Alessandro Zummo <a.zummo@...ertech.it>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Guenter Roeck <linux@...ck-us.net>,
        Chris Packham <chris.packham@...iedtelesis.co.nz>,
        "linux-rtc@...r.kernel.org" <linux-rtc@...r.kernel.org>
CC:     "kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: AW: [PATCH][next] rtc: ds1307: check for failed memory allocation on
 wdt


________________________________________
Von: kernel-janitors-owner@...r.kernel.org <kernel-janitors-owner@...r.kernel.org> im Auftrag von Colin King <colin.king@...onical.com>
Gesendet: Donnerstag, 2. April 2020 15:14
An: Alessandro Zummo; Alexandre Belloni; Guenter Roeck; Chris Packham; linux-rtc@...r.kernel.org
Cc: kernel-janitors@...r.kernel.org; linux-kernel@...r.kernel.org
Betreff: [PATCH][next] rtc: ds1307: check for failed memory allocation on wdt

From: Colin Ian King <colin.king@...onical.com>

Currently a failed memory allocation will lead to a null pointer
dereference on point wdt.  Fix this by checking for a failed allocation
and adding error return handling to function ds1307_wdt_register.

Addresses-Coverity: ("Dereference null return")
Fixes: fd90d48db037 ("rtc: ds1307: add support for watchdog timer on ds1388")
Signed-off-by: Colin Ian King <colin.king@...onical.com>
---
 drivers/rtc/rtc-ds1307.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index fad042118862..95c5b6facc59 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1665,14 +1665,16 @@ static const struct watchdog_ops ds1388_wdt_ops = {

 };

-static void ds1307_wdt_register(struct ds1307 *ds1307)
+static int ds1307_wdt_register(struct ds1307 *ds1307)
 {
        struct watchdog_device  *wdt;

        if (ds1307->type != ds_1388)
-               return;
+               return 0;

        wdt = devm_kzalloc(ds1307->dev, sizeof(*wdt), GFP_KERNEL);
+       if (!wdt)
+               return -ENOMEM;

        wdt->info = &ds1388_wdt_info;
        wdt->ops = &ds1388_wdt_ops;
@@ -1683,10 +1685,13 @@ static void ds1307_wdt_register(struct ds1307 *ds1307)
        watchdog_init_timeout(wdt, 0, ds1307->dev);
        watchdog_set_drvdata(wdt, ds1307);
        devm_watchdog_register_device(ds1307->dev, wdt);
+
+       return 0;
 }
 #else
-static void ds1307_wdt_register(struct ds1307 *ds1307)
+static int ds1307_wdt_register(struct ds1307 *ds1307)
 {
+       return 0;
 }
 #endif /* CONFIG_WATCHDOG_CORE */

@@ -1979,9 +1984,9 @@ static int ds1307_probe(struct i2c_client *client,

        ds1307_hwmon_register(ds1307);
        ds1307_clks_register(ds1307);
-       ds1307_wdt_register(ds1307);
+       err = ds1307_wdt_register(ds1307);

-       return 0;
+       return err;

 exit:
        return err;
--
2.25.1

IMHO, one "return err;" is sufficient.

re,
 wh