linux-kernel - Re: [PATCH] watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog

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]

Date: Fri, 26 Apr 2024 06:36:23 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: Chen Ni <nichen@...as.ac.cn>, wim@...ux-watchdog.org, arnd@...db.de
Cc: linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in
 sa1100dog_probe()

On 4/26/24 00:58, Chen Ni wrote:
> devm_ioremap() doesn't return error pointers, it returns NULL on error.
> Update the check accordingly.
> 
> Fixes: e86bd43bcfc5 ("watchdog: sa1100: use platform device registration")
> Signed-off-by: Chen Ni <nichen@...as.ac.cn>

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

> ---
>   drivers/watchdog/sa1100_wdt.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
> index 5d2df008b92a..34a917221e31 100644
> --- a/drivers/watchdog/sa1100_wdt.c
> +++ b/drivers/watchdog/sa1100_wdt.c
> @@ -191,9 +191,8 @@ static int sa1100dog_probe(struct platform_device *pdev)
>   	if (!res)
>   		return -ENXIO;
>   	reg_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> -	ret = PTR_ERR_OR_ZERO(reg_base);
> -	if (ret)
> -		return ret;
> +	if (!reg_base)
> +		return -ENOMEM;
>   
>   	clk = clk_get(NULL, "OSTIMER0");
>   	if (IS_ERR(clk)) {