target/linux/generic/backport-5.10/811-v6.1-0012-nvmem-rmem-Fix-return-value-check-in-rmem_read.patch

   1 From 58e92c4a496b27156020a59a98c7f4a92c2b1533 Mon Sep 17 00:00:00 2001
   2 From: Wei Yongjun <weiyongjun1@huawei.com>
   3 Date: Fri, 18 Nov 2022 06:38:38 +0000
   4 Subject: [PATCH] nvmem: rmem: Fix return value check in rmem_read()
   5
   6 In case of error, the function memremap() returns NULL pointer
   7 not ERR_PTR(). The IS_ERR() test in the return value check
   8 should be replaced with NULL test.
   9
  10 Fixes: 5a3fa75a4d9c ("nvmem: Add driver to expose reserved memory as nvmem")
  11 Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  12 Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  13 Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
  14 Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  15 Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
  16 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  17 Link: https://lore.kernel.org/r/20221118063840.6357-3-srinivas.kandagatla@linaro.org
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  drivers/nvmem/rmem.c | 4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 --- a/drivers/nvmem/rmem.c
  24 +++ b/drivers/nvmem/rmem.c
  25 @@ -37,9 +37,9 @@ static int rmem_read(void *context, unsi
  26          * but as of Dec 2020 this isn't possible on arm64.
  27          */
  28         addr = memremap(priv->mem->base, available, MEMREMAP_WB);
  29 -       if (IS_ERR(addr)) {
  30 +       if (!addr) {
  31                 dev_err(priv->dev, "Failed to remap memory region\n");
  32 -               return PTR_ERR(addr);
  33 +               return -ENOMEM;
  34         }
  35
  36         count = memory_read_from_buffer(val, bytes, &off, addr, available);