From: Guenter Roeck <linux@roeck-us.net>
To: Colin King <colin.king@canonical.com>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Chris Packham <chris.packham@alliedtelesis.co.nz>,
linux-rtc@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH][V2][next] rtc: ds1307: check for failed memory allocation on wdt
Date: Thu, 2 Apr 2020 07:39:51 -0700 [thread overview]
Message-ID: <15e369be-847a-f480-988d-7d119d1f5bf3@roeck-us.net> (raw)
In-Reply-To: <20200402135201.548313-1-colin.king@canonical.com>
On 4/2/20 6:52 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.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.
> Also move the error exit label "exit" to allow a return statement to
> be removed.
>
> 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>
> ---
> V2: move error exit label and remove a return statement, thanks to
> Walter Harms for spotting this clean up.
> ---
> drivers/rtc/rtc-ds1307.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
> index fad042118862..c058b02efb4d 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)
What exactly is the point of returning an error just to ignore it ?
Guenter
> {
> 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,10 +1984,7 @@ static int ds1307_probe(struct i2c_client *client,
>
> ds1307_hwmon_register(ds1307);
> ds1307_clks_register(ds1307);
> - ds1307_wdt_register(ds1307);
> -
> - return 0;
> -
> + err = ds1307_wdt_register(ds1307);
> exit:
> return err;
> }
>
next prev parent reply other threads:[~2020-04-02 14:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 13:52 [PATCH][V2][next] rtc: ds1307: check for failed memory allocation on wdt Colin King
2020-04-02 14:39 ` Guenter Roeck [this message]
2020-04-02 14:44 ` Guenter Roeck
2020-04-02 14:53 ` Alexandre Belloni
2020-04-03 8:45 ` Dan Carpenter
2020-04-03 9:22 ` Alexandre Belloni
2020-04-03 10:01 ` Colin Ian King
2020-04-02 19:51 ` Chris Packham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15e369be-847a-f480-988d-7d119d1f5bf3@roeck-us.net \
--to=linux@roeck-us.net \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=colin.king@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).