Commit 58e92c4a authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

nvmem: rmem: Fix return value check in rmem_read() 



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: 5a3fa75a ("nvmem: Add driver to expose reserved memory as nvmem")
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Acked-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221118063840.6357-3-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9919d418

drivers/nvmem/rmem.c

+2 −2
Original line number Diff line number Diff line
@@ -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);