2023-07-16 02:08:32

by Wang Ming

Subject: [PATCH v2] firmware: Fix an NULL vs IS_ERR() bug in probe

The devm_memremap() function returns error pointers.
It never returns NULL. Fix the check.

Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver")
Signed-off-by: Wang Ming <[email protected]>
---
drivers/firmware/stratix10-svc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 2d674126160f..935bc0cf913f 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -756,7 +756,8 @@ svc_create_memory_pool(struct platform_device *pdev,
paddr = begin;
size = end - begin;
va = devm_memremap(dev, paddr, size, MEMREMAP_WC);
- if (!va) {
+
+ if (IS_ERR(va)) {
dev_err(dev, "fail to remap shared memory\n");
return ERR_PTR(-EINVAL);
}
--
2.25.1

2023-07-16 07:21:03

by Greg Kroah-Hartman

Subject: Re: [PATCH v2] firmware: Fix an NULL vs IS_ERR() bug in probe

On Sun, Jul 16, 2023 at 09:52:57AM +0800, Wang Ming wrote:
> The devm_memremap() function returns error pointers.
> It never returns NULL. Fix the check.
>
> Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver")
> Signed-off-by: Wang Ming <[email protected]>
> ---
> drivers/firmware/stratix10-svc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
> index 2d674126160f..935bc0cf913f 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -756,7 +756,8 @@ svc_create_memory_pool(struct platform_device *pdev,
> paddr = begin;
> size = end - begin;
> va = devm_memremap(dev, paddr, size, MEMREMAP_WC);
> - if (!va) {
> +
> + if (IS_ERR(va)) {

Why did you add an extra blank line?