2022-11-15 09:20:45

by Peng Wu

Subject: [PATCH -next] firmware: google: fix a NULL vs IS_ERR() check in cbmem_entry_probe()

The devm_memremap() function returns error pointers on error,
it doesn't return NULL.

Fixes: 19d54020883c ("firmware: google: Implement cbmem in sysfs driver")
Signed-off-by: Peng Wu <[email protected]>
---
drivers/firmware/google/cbmem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbmem.c
index 685f3070ce9d..88e587ba1e0d 100644
--- a/drivers/firmware/google/cbmem.c
+++ b/drivers/firmware/google/cbmem.c
@@ -106,8 +106,8 @@ static int cbmem_entry_probe(struct coreboot_device *dev)
entry->mem_file_buf = devm_memremap(&dev->dev, dev->cbmem_entry.address,
dev->cbmem_entry.entry_size,
MEMREMAP_WB);
- if (!entry->mem_file_buf)
- return -ENOMEM;
+ if (IS_ERR(entry->mem_file_buf))
+ return PTR_ERR(entry->mem_file_buf);

entry->size = dev->cbmem_entry.entry_size;

--
2.17.1

2022-11-15 13:59:03

by Guenter Roeck

Subject: Re: [PATCH -next] firmware: google: fix a NULL vs IS_ERR() check in cbmem_entry_probe()

On Tue, Nov 15, 2022 at 1:14 AM Peng Wu <[email protected]> wrote:
>
> The devm_memremap() function returns error pointers on error,
> it doesn't return NULL.
>
> Fixes: 19d54020883c ("firmware: google: Implement cbmem in sysfs driver")
> Signed-off-by: Peng Wu <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/firmware/google/cbmem.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbmem.c
> index 685f3070ce9d..88e587ba1e0d 100644
> --- a/drivers/firmware/google/cbmem.c
> +++ b/drivers/firmware/google/cbmem.c
> @@ -106,8 +106,8 @@ static int cbmem_entry_probe(struct coreboot_device *dev)
> entry->mem_file_buf = devm_memremap(&dev->dev, dev->cbmem_entry.address,
> dev->cbmem_entry.entry_size,
> MEMREMAP_WB);
> - if (!entry->mem_file_buf)
> - return -ENOMEM;
> + if (IS_ERR(entry->mem_file_buf))
> + return PTR_ERR(entry->mem_file_buf);
>
> entry->size = dev->cbmem_entry.entry_size;
>
> --
> 2.17.1
>

2022-11-15 17:20:35

by Jack Rosenthal

Subject: Re: [PATCH -next] firmware: google: fix a NULL vs IS_ERR() check in cbmem_entry_probe()

On 2022-11-15 at 09:11 +0000, Peng Wu wrote:
> The devm_memremap() function returns error pointers on error,
> it doesn't return NULL.
>
> Fixes: 19d54020883c ("firmware: google: Implement cbmem in sysfs driver")
> Signed-off-by: Peng Wu <[email protected]>

Reviewed-by: Jack Rosenthal <[email protected]>

> ---
> drivers/firmware/google/cbmem.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbmem.c
> index 685f3070ce9d..88e587ba1e0d 100644
> --- a/drivers/firmware/google/cbmem.c
> +++ b/drivers/firmware/google/cbmem.c
> @@ -106,8 +106,8 @@ static int cbmem_entry_probe(struct coreboot_device *dev)
> entry->mem_file_buf = devm_memremap(&dev->dev, dev->cbmem_entry.address,
> dev->cbmem_entry.entry_size,
> MEMREMAP_WB);
> - if (!entry->mem_file_buf)
> - return -ENOMEM;
> + if (IS_ERR(entry->mem_file_buf))
> + return PTR_ERR(entry->mem_file_buf);
>
> entry->size = dev->cbmem_entry.entry_size;
>
> --
> 2.17.1
>