linux-kernel - [PATCH RESEND] nvmem: Fix return value check in rmem

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221102032523.1488171-1-yangyingliang@huawei.com>
Date:   Wed, 2 Nov 2022 11:25:23 +0800
From:   Yang Yingliang <yangyingliang@...wei.com>
To:     <linux-kernel@...r.kernel.org>
CC:     Wei Yongjun <weiyongjun1@...wei.com>,
        Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
        Nicolas Saenz Julienne <nsaenzjulienne@...e.de>,
        Yang Yingliang <yangyingliang@...wei.com>
Subject: [PATCH RESEND] nvmem: Fix return value check in rmem_read()

From: Wei Yongjun <weiyongjun1@...wei.com>

In case of error, the function memremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: 5a3fa75a4d9c ("nvmem: Add driver to expose reserved memory as nvmem")
Cc: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@...e.de>
Signed-off-by: Wei Yongjun <weiyongjun1@...wei.com>
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@...e.de>
Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
---
The previous patch link:
https://lore.kernel.org/all/2fff7c82d983baccb91c4a1c0891a9b6cdc50dd6.camel@suse.de/T/
---
 drivers/nvmem/rmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c
index b11c3c974b3d..80cb187f1481 100644
--- a/drivers/nvmem/rmem.c
+++ b/drivers/nvmem/rmem.c
@@ -37,9 +37,9 @@ static int rmem_read(void *context, unsigned int offset,
 	 * but as of Dec 2020 this isn't possible on arm64.
 	 */
 	addr = memremap(priv->mem->base, available, MEMREMAP_WB);
-	if (IS_ERR(addr)) {
+	if (!addr) {
 		dev_err(priv->dev, "Failed to remap memory region\n");
-		return PTR_ERR(addr);
+		return -ENOMEM;
 	}
 
 	count = memory_read_from_buffer(val, bytes, &off, addr, available);
-- 
2.25.1