Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs callbacks

After retrieving WMI data blocks in sysfs callbacks, check for the
validity of them before dereferencing their content.

Reported-by: Jan Graczyk <jangraczyk@yahoo.ca>
Closes: https://lore.kernel.org/r/CAHk-=wgMiSKXf7SvQrfEnxVtmT=QVQPjJdNjfm3aXS7wc=rzTw@mail.gmail.com/
Fixes: e8a60aa7404b ("platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems")
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Link: https://lore.kernel.org/r/20250630-sysman-fix-v2-1-d185674d0a30@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

authored by

Kurt Borja and committed by
Ilpo Järvinen
eb617dd2 50b6914f

+21 -12
+5
drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h
··· 89 89 90 90 enum { ENUM, INT, STR, PO }; 91 91 92 + #define ENUM_MIN_ELEMENTS 8 93 + #define INT_MIN_ELEMENTS 9 94 + #define STR_MIN_ELEMENTS 8 95 + #define PO_MIN_ELEMENTS 4 96 + 92 97 enum { 93 98 ATTR_NAME, 94 99 DISPL_NAME_LANG_CODE,
+3 -2
drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c
··· 23 23 obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_ENUMERATION_ATTRIBUTE_GUID); 24 24 if (!obj) 25 25 return -EIO; 26 - if (obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { 26 + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < ENUM_MIN_ELEMENTS || 27 + obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { 27 28 kfree(obj); 28 - return -EINVAL; 29 + return -EIO; 29 30 } 30 31 ret = snprintf(buf, PAGE_SIZE, "%s\n", obj->package.elements[CURRENT_VAL].string.pointer); 31 32 kfree(obj);
+3 -2
drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c
··· 25 25 obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_INTEGER_ATTRIBUTE_GUID); 26 26 if (!obj) 27 27 return -EIO; 28 - if (obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_INTEGER) { 28 + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < INT_MIN_ELEMENTS || 29 + obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_INTEGER) { 29 30 kfree(obj); 30 - return -EINVAL; 31 + return -EIO; 31 32 } 32 33 ret = snprintf(buf, PAGE_SIZE, "%lld\n", obj->package.elements[CURRENT_VAL].integer.value); 33 34 kfree(obj);
+3 -2
drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c
··· 26 26 obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_PASSOBJ_ATTRIBUTE_GUID); 27 27 if (!obj) 28 28 return -EIO; 29 - if (obj->package.elements[IS_PASS_SET].type != ACPI_TYPE_INTEGER) { 29 + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < PO_MIN_ELEMENTS || 30 + obj->package.elements[IS_PASS_SET].type != ACPI_TYPE_INTEGER) { 30 31 kfree(obj); 31 - return -EINVAL; 32 + return -EIO; 32 33 } 33 34 ret = snprintf(buf, PAGE_SIZE, "%lld\n", obj->package.elements[IS_PASS_SET].integer.value); 34 35 kfree(obj);
+3 -2
drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c
··· 25 25 obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_STRING_ATTRIBUTE_GUID); 26 26 if (!obj) 27 27 return -EIO; 28 - if (obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { 28 + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < STR_MIN_ELEMENTS || 29 + obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { 29 30 kfree(obj); 30 - return -EINVAL; 31 + return -EIO; 31 32 } 32 33 ret = snprintf(buf, PAGE_SIZE, "%s\n", obj->package.elements[CURRENT_VAL].string.pointer); 33 34 kfree(obj);
+4 -4
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
··· 407 407 return retval; 408 408 409 409 switch (attr_type) { 410 - case ENUM: min_elements = 8; break; 411 - case INT: min_elements = 9; break; 412 - case STR: min_elements = 8; break; 413 - case PO: min_elements = 4; break; 410 + case ENUM: min_elements = ENUM_MIN_ELEMENTS; break; 411 + case INT: min_elements = INT_MIN_ELEMENTS; break; 412 + case STR: min_elements = STR_MIN_ELEMENTS; break; 413 + case PO: min_elements = PO_MIN_ELEMENTS; break; 414 414 default: 415 415 pr_err("Error: Unknown attr_type: %d\n", attr_type); 416 416 return -EINVAL;