Unverified Commit 1570d365 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12844 ACPI: sysfs: validate return type of _STR method 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NMIHB2TKPT556HIULIESNFDLVXL4CXJJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYQON 
 
Link:https://gitee.com/openeuler/kernel/pulls/12844

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 6c173ff8 e1896289

drivers/acpi/device_sysfs.c

+3 −2
Original line number Diff line number Diff line
@@ -533,8 +533,9 @@ int acpi_device_setup_files(struct acpi_device *dev) 
	 * If device has _STR, 'description' file is created

	 */

	if (acpi_has_method(dev->handle, "_STR")) {

		status = acpi_evaluate_object(dev->handle, "_STR",

					NULL, &buffer);

		status = acpi_evaluate_object_typed(dev->handle, "_STR",

						    NULL, &buffer,

						    ACPI_TYPE_BUFFER);

		if (ACPI_FAILURE(status))

			buffer.pointer = NULL;

		dev->pnp.str_obj = buffer.pointer;