|
Lee, Chun-Yi |
e5dbfe |
From: Yang Yingliang <yangyingliang@huawei.com>
|
|
Lee, Chun-Yi |
e5dbfe |
Date: Thu, 6 Jan 2022 15:54:48 +0800
|
|
Lee, Chun-Yi |
e5dbfe |
Subject: ACPI: pfr_update: Fix return value check in pfru_write()
|
|
Lee, Chun-Yi |
e5dbfe |
Patch-mainline: v5.17-rc1
|
|
Lee, Chun-Yi |
e5dbfe |
Git-commit: 31834aaa4e2a26d8d1f6b36703bb35cfdb8fc98c
|
|
Lee, Chun-Yi |
e5dbfe |
References: jsc#PED-1408
|
|
Lee, Chun-Yi |
e5dbfe |
|
|
Lee, Chun-Yi |
e5dbfe |
In case of error, memremap() returns NULL pointer not
|
|
Lee, Chun-Yi |
e5dbfe |
ERR_PTR(). The IS_ERR() test in the return value check
|
|
Lee, Chun-Yi |
e5dbfe |
should be replaced with NULL test.
|
|
Lee, Chun-Yi |
e5dbfe |
|
|
Lee, Chun-Yi |
e5dbfe |
Fixes: 0db89fa243e5 ("ACPI: Introduce Platform Firmware Runtime Update device driver")
|
|
Lee, Chun-Yi |
e5dbfe |
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
Lee, Chun-Yi |
e5dbfe |
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
|
|
Lee, Chun-Yi |
e5dbfe |
Acked-by: Chen Yu <yu.c.chen@intel.com>
|
|
Lee, Chun-Yi |
e5dbfe |
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
|
Lee, Chun-Yi |
e5dbfe |
Acked-by: Lee, Chun-Yi <jlee@suse.com>
|
|
Lee, Chun-Yi |
e5dbfe |
---
|
|
Lee, Chun-Yi |
e5dbfe |
drivers/acpi/pfr_update.c | 4 ++--
|
|
Lee, Chun-Yi |
e5dbfe |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Lee, Chun-Yi |
e5dbfe |
|
|
Lee, Chun-Yi |
e5dbfe |
--- a/drivers/acpi/pfr_update.c
|
|
Lee, Chun-Yi |
e5dbfe |
+++ b/drivers/acpi/pfr_update.c
|
|
Lee, Chun-Yi |
e5dbfe |
@@ -460,8 +460,8 @@ static ssize_t pfru_write(struct file *f
|
|
Lee, Chun-Yi |
e5dbfe |
/* map the communication buffer */
|
|
Lee, Chun-Yi |
e5dbfe |
phy_addr = (phys_addr_t)((buf_info.addr_hi << 32) | buf_info.addr_lo);
|
|
Lee, Chun-Yi |
e5dbfe |
buf_ptr = memremap(phy_addr, buf_info.buf_size, MEMREMAP_WB);
|
|
Lee, Chun-Yi |
e5dbfe |
- if (IS_ERR(buf_ptr))
|
|
Lee, Chun-Yi |
e5dbfe |
- return PTR_ERR(buf_ptr);
|
|
Lee, Chun-Yi |
e5dbfe |
+ if (!buf_ptr)
|
|
Lee, Chun-Yi |
e5dbfe |
+ return -ENOMEM;
|
|
Lee, Chun-Yi |
e5dbfe |
|
|
Lee, Chun-Yi |
e5dbfe |
if (!copy_from_iter_full(buf_ptr, len, &iter)) {
|
|
Lee, Chun-Yi |
e5dbfe |
ret = -EINVAL;
|