2022-08-28 20:58:37

by Li Zhong

Subject: [PATCH v1] drivers/acpi/x86: check return null pointer from acpi_evaluate_dsm()

From: lily <[email protected]>

Check return value from acpi_evaluate_dsm(). Only do ACPI_FREE() when
out_obj is not NULL pointers.

Signed-off-by: Li Zhong <[email protected]>
---
drivers/acpi/x86/s2idle.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
index f9ac12b778e6..1b449d3cfbf7 100644
--- a/drivers/acpi/x86/s2idle.c
+++ b/drivers/acpi/x86/s2idle.c
@@ -328,7 +328,8 @@ static void acpi_sleep_run_lps0_dsm(unsigned int func, unsigned int func_mask, g

out_obj = acpi_evaluate_dsm(lps0_device_handle, &dsm_guid,
rev_id, func, NULL);
- ACPI_FREE(out_obj);
+ if (!out_obj)
+ ACPI_FREE(out_obj);

acpi_handle_debug(lps0_device_handle, "_DSM function %u evaluation %s\n",
func, out_obj ? "successful" : "failed");
--
2.25.1

2022-08-29 05:48:00

by Mika Westerberg

Subject: Re: [PATCH v1] drivers/acpi/x86: check return null pointer from acpi_evaluate_dsm()

Hi,

On Sun, Aug 28, 2022 at 01:51:20PM -0700, Li Zhong wrote:
> From: lily <[email protected]>
>
> Check return value from acpi_evaluate_dsm(). Only do ACPI_FREE() when
> out_obj is not NULL pointers.

ACPI_FREE() expands to kfree() and that allows NULL pointers so I don't
think this patch is necessary.