Skip to content

Commit 1027f1f

Browse files
committed
platform/x86: dell-wmi-sysman: Make init_bios_attributes() ACPI object parsing more robust
jira LE-3064 Rebuild_History Non-Buildable kernel-4.18.0-553.53.1.el8_10 commit-author Hans de Goede <hdegoede@redhat.com> commit 5e3f597 Make init_bios_attributes() ACPI object parsing more robust: 1. Always check that the type of the return ACPI object is package, rather then only checking this for instance_id == 0 2. Check that the package has the minimum amount of elements which will be consumed by the populate_foo_data() for the attr_type Note/TODO: The populate_foo_data() functions should also be made more robust. The should check the type of each of the elements matches the type which they expect and in case of populate_enum_data() obj->package.count should be passed to it as an argument and it should re-check this itself since it consume a variable number of elements. Fixes: e8a60aa ("platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems") Cc: Divya Bharathi <Divya_Bharathi@dell.com> Cc: Mario Limonciello <mario.limonciello@dell.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20210321121607.35717-1-hdegoede@redhat.com (cherry picked from commit 5e3f597) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 3e8b4ec commit 1027f1f

File tree

1 file changed

+28
-4
lines changed
  • drivers/platform/x86/dell-wmi-sysman

1 file changed

+28
-4
lines changed

drivers/platform/x86/dell-wmi-sysman/sysman.c

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ static int init_bios_attributes(int attr_type, const char *guid)
397397
union acpi_object *obj = NULL;
398398
union acpi_object *elements;
399399
struct kset *tmp_set;
400+
int min_elements;
400401

401402
/* instance_id needs to be reset for each type GUID
402403
* also, instance IDs are unique within GUID but not across
@@ -407,14 +408,38 @@ static int init_bios_attributes(int attr_type, const char *guid)
407408
retval = alloc_attributes_data(attr_type);
408409
if (retval)
409410
return retval;
411+
412+
switch (attr_type) {
413+
case ENUM: min_elements = 8; break;
414+
case INT: min_elements = 9; break;
415+
case STR: min_elements = 8; break;
416+
case PO: min_elements = 4; break;
417+
default:
418+
pr_err("Error: Unknown attr_type: %d\n", attr_type);
419+
return -EINVAL;
420+
}
421+
410422
/* need to use specific instance_id and guid combination to get right data */
411423
obj = get_wmiobj_pointer(instance_id, guid);
412-
if (!obj || obj->type != ACPI_TYPE_PACKAGE)
424+
if (!obj)
413425
return -ENODEV;
414-
elements = obj->package.elements;
415426

416427
mutex_lock(&wmi_priv.mutex);
417-
while (elements) {
428+
while (obj) {
429+
if (obj->type != ACPI_TYPE_PACKAGE) {
430+
pr_err("Error: Expected ACPI-package type, got: %d\n", obj->type);
431+
retval = -EIO;
432+
goto err_attr_init;
433+
}
434+
435+
if (obj->package.count < min_elements) {
436+
pr_err("Error: ACPI-package does not have enough elements: %d < %d\n",
437+
obj->package.count, min_elements);
438+
goto nextobj;
439+
}
440+
441+
elements = obj->package.elements;
442+
418443
/* sanity checking */
419444
if (elements[ATTR_NAME].type != ACPI_TYPE_STRING) {
420445
pr_debug("incorrect element type\n");
@@ -479,7 +504,6 @@ static int init_bios_attributes(int attr_type, const char *guid)
479504
kfree(obj);
480505
instance_id++;
481506
obj = get_wmiobj_pointer(instance_id, guid);
482-
elements = obj ? obj->package.elements : NULL;
483507
}
484508

485509
mutex_unlock(&wmi_priv.mutex);

0 commit comments

Comments
 (0)