lkml.org 
[lkml]   [2020]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()


Le lun. 3 août 2020 à 17:36, Dan Carpenter <dan.carpenter@oracle.com>
a écrit :
> The devm_ioremap() function returns NULL on error, it doesn't return
> error pointers. This bug could lead to an Oops during probe.
>
> Fixes: f046e4a3f0b9 ("memory: jz4780_nemc: Only request IO memory the
> driver will use")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Paul Cercueil <paul@crapouillou.net>

Thanks!
-Paul

> ---
> drivers/memory/jz4780-nemc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/memory/jz4780-nemc.c
> b/drivers/memory/jz4780-nemc.c
> index 3ec5cb0fce1e..608ae925e641 100644
> --- a/drivers/memory/jz4780-nemc.c
> +++ b/drivers/memory/jz4780-nemc.c
> @@ -304,9 +304,9 @@ static int jz4780_nemc_probe(struct
> platform_device *pdev)
> }
>
> nemc->base = devm_ioremap(dev, res->start, NEMC_REG_LEN);
> - if (IS_ERR(nemc->base)) {
> + if (!nemc->base) {
> dev_err(dev, "failed to get I/O memory\n");
> - return PTR_ERR(nemc->base);
> + return -ENOMEM;
> }
>
> writel(0, nemc->base + NEMC_NFCSR);
> --
> 2.27.0
>


\
 
 \ /
  Last update: 2020-08-06 22:55    [W:0.051 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site