linux-kernel - Re: [PATCH] watchdog: only run driver set

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] [day] [month] [year] [list]

Message-ID: <42547712-88c9-b432-f049-f2db8447739d@roeck-us.net>
Date:   Sun, 27 Jun 2021 08:01:04 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     Curtis Klein <curtis.klein@....com>, wim@...ux-watchdog.org
Cc:     linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] watchdog: only run driver set_pretimeout op if device
 supports it

On 6/26/21 4:47 PM, Curtis Klein wrote:
> Some watchdog devices might conditionally support pretimeouts (e.g. if
> an interrupt is exposed for the device) but some watchdog drivers might
> still define the set_pretimeout operation (e.g. the mtk_wdt driver) and
> indicate support at runtime through the WDIOF_PRETIMEOUT flag. If the
> kernel is compiled with CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT enabled,
> watchdog_set_pretimeout would run the driver specific set_pretimeout
> even if WDIOF_PRETIMEOUT is not set which might have unintended
> consequences.
> 
> So this change checks that the device flags and only runs the driver
> operation if pretimeouts are supported.
> 
> Signed-off-by: Curtis Klein <curtis.klein@....com>

Reviewed-by: Guenter Roeck <linux@...ck-us.net>

> ---
>   drivers/watchdog/watchdog_dev.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 3bab324..5bf795c 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -401,7 +401,7 @@ static int watchdog_set_pretimeout(struct watchdog_device *wdd,
>   	if (watchdog_pretimeout_invalid(wdd, timeout))
>   		return -EINVAL;
>   
> -	if (wdd->ops->set_pretimeout)
> +	if (wdd->ops->set_pretimeout && (wdd->info->options & WDIOF_PRETIMEOUT))
>   		err = wdd->ops->set_pretimeout(wdd, timeout);
>   	else
>   		wdd->pretimeout = timeout;
>