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

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

Posted by Wang Ming 2 years, 6 months ago

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 <machel@vivo.com>
---
 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

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

Posted by Greg Kroah-Hartman 2 years, 6 months ago

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 <machel@vivo.com>
> ---
>  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?