From: Guenter Roeck <linux@roeck-us.net>
To: Johannes Thumshirn <jth@kernel.org>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] watchdog: menz069_wdt: fix watchdog initialisation
Date: Tue, 18 Apr 2023 11:20:54 -0700 [thread overview]
Message-ID: <ed83c3a3-1189-3d8d-08b5-014bcfce88cc@roeck-us.net> (raw)
In-Reply-To: <20230418172531.177349-2-jth@kernel.org>
On 4/18/23 10:25, Johannes Thumshirn wrote:
> Doing a 'cat /dev/watchdog0' with menz069_wdt as watchdog0 will result in
> a NULL pointer dereference.
>
> This happens because we're passing the wrong pointer to
> watchdog_register_device(). Fix this by getting rid of the static
> watchdog_device structure and use the one embedded into the driver's
> per-instance private data.
>
> Signed-off-by: Johannes Thumshirn <jth@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/menz69_wdt.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c
> index 8973f98bc6a5..bca0938f3429 100644
> --- a/drivers/watchdog/menz69_wdt.c
> +++ b/drivers/watchdog/menz69_wdt.c
> @@ -98,14 +98,6 @@ static const struct watchdog_ops men_z069_ops = {
> .set_timeout = men_z069_wdt_set_timeout,
> };
>
> -static struct watchdog_device men_z069_wdt = {
> - .info = &men_z069_info,
> - .ops = &men_z069_ops,
> - .timeout = MEN_Z069_DEFAULT_TIMEOUT,
> - .min_timeout = 1,
> - .max_timeout = MEN_Z069_WDT_COUNTER_MAX / MEN_Z069_TIMER_FREQ,
> -};
> -
> static int men_z069_probe(struct mcb_device *dev,
> const struct mcb_device_id *id)
> {
> @@ -125,15 +117,19 @@ static int men_z069_probe(struct mcb_device *dev,
> goto release_mem;
>
> drv->mem = mem;
> + drv->wdt.info = &men_z069_info;
> + drv->wdt.ops = &men_z069_ops;
> + drv->wdt.timeout = MEN_Z069_DEFAULT_TIMEOUT;
> + drv->wdt.min_timeout = 1;
> + drv->wdt.max_timeout = MEN_Z069_WDT_COUNTER_MAX / MEN_Z069_TIMER_FREQ;
>
> - drv->wdt = men_z069_wdt;
> watchdog_init_timeout(&drv->wdt, 0, &dev->dev);
> watchdog_set_nowayout(&drv->wdt, nowayout);
> watchdog_set_drvdata(&drv->wdt, drv);
> drv->wdt.parent = &dev->dev;
> mcb_set_drvdata(dev, drv);
>
> - return watchdog_register_device(&men_z069_wdt);
> + return watchdog_register_device(&drv->wdt);
>
> release_mem:
> mcb_release_mem(mem);
next prev parent reply other threads:[~2023-04-18 18:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 17:25 [PATCH 0/2] watchdog: fixes for menz069_wdt driver Johannes Thumshirn
2023-04-18 17:25 ` [PATCH 1/2] watchdog: menz069_wdt: fix watchdog initialisation Johannes Thumshirn
2023-04-18 18:20 ` Guenter Roeck [this message]
2023-04-18 17:25 ` [PATCH 2/2] watchdog: menz069_wdt: fix timeout setting Johannes Thumshirn
2023-04-18 18:21 ` Guenter Roeck
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=ed83c3a3-1189-3d8d-08b5-014bcfce88cc@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jth@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@linux-watchdog.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
all inboxes | Powered by JetHome®