Skip to content

Commit

Permalink
platform/x86: dell-wmi: increase severity of some failures
Browse files Browse the repository at this point in the history
There is a lot of error checking in place for the format of the WMI
descriptor buffer, but some of the potentially raised issues should
be considered critical failures.

If the buffer size or header don't match, this is a good indication
that the buffer format changed in a way that the rest of the data
should not be relied upon.

For the remaining data set vectors, continue to notate a warning
in undefined results, but as those are fields that the descriptor
intended to refer to other applications, don't fail if they're new
values.

Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Reviewed-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
  • Loading branch information
Mario Limonciello authored and Darren Hart (VMware) committed Nov 3, 2017
1 parent 722c856 commit d0bf42d
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/platform/x86/dell-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -657,17 +657,18 @@ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev)
dev_err(&wdev->dev,
"Dell descriptor buffer has invalid length (%d)\n",
obj->buffer.length);
if (obj->buffer.length < 16) {
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}

buffer = (u32 *)obj->buffer.pointer;

if (buffer[0] != 0x4C4C4544 && buffer[1] != 0x494D5720)
dev_warn(&wdev->dev, "Dell descriptor buffer has invalid signature (%*ph)\n",
if (buffer[0] != 0x4C4C4544 && buffer[1] != 0x494D5720) {
dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%*ph)\n",
8, buffer);
ret = -EINVAL;
goto out;
}

if (buffer[2] != 0 && buffer[2] != 1)
dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%d)\n",
Expand Down

0 comments on commit d0bf42d

Please sign in to comment.