linux-kernel - RE: [PATCH] i2c: mlxbf: Fix an error pointer vs NULL check

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:   Sat, 5 Dec 2020 01:39:32 +0000
From:   Khalil Blaiech <kblaiech@...dia.com>
To:     Xu Wang <vulab@...as.ac.cn>
CC:     "linux-i2c@...r.kernel.org" <linux-i2c@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] i2c: mlxbf: Fix an error pointer vs NULL check



> In case of error, the function devm_ioremap() returns NULL pointer not
> ERR_PTR(). The IS_ERR() test in the return value check should be
> replaced with NULL test.
> 
> Signed-off-by: Xu Wang <vulab@...as.ac.cn>

Thank you very much for your patch. Please note that previous patch
has been posted to address this issue.

> ---
>  drivers/i2c/busses/i2c-mlxbf.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
> index 33574d40ea9c..73a58beb7b82 100644
> --- a/drivers/i2c/busses/i2c-mlxbf.c
> +++ b/drivers/i2c/busses/i2c-mlxbf.c
> @@ -1258,9 +1258,9 @@ static int mlxbf_i2c_get_gpio(struct
> platform_device *pdev,
>  		return -EFAULT;
> 
>  	gpio_res->io = devm_ioremap(dev, params->start, size);
> -	if (IS_ERR(gpio_res->io)) {
> +	if (!gpio_res->io) {
>  		devm_release_mem_region(dev, params->start, size);
> -		return PTR_ERR(gpio_res->io);
> +		return -ENOMEM;
>  	}
> 
>  	return 0;
> @@ -1323,9 +1323,9 @@ static int mlxbf_i2c_get_corepll(struct
> platform_device *pdev,
>  		return -EFAULT;
> 
>  	corepll_res->io = devm_ioremap(dev, params->start, size);
> -	if (IS_ERR(corepll_res->io)) {
> +	if (!corepll_res->io) {
>  		devm_release_mem_region(dev, params->start, size);
> -		return PTR_ERR(corepll_res->io);
> +		return -ENOMEM;
>  	}
> 
>  	return 0;
> --
> 2.17.1