linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mario Limonciello <mario.limonciello@dell.com>
To: dvhart@infradead.org, Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	platform-driver-x86@vger.kernel.org,
	Andy Lutomirski <luto@kernel.org>,
	quasisec@google.com, pali.rohar@gmail.com, rjw@rjwysocki.net,
	mjg59@google.com, hch@lst.de, Greg KH <greg@kroah.com>,
	Alan Cox <gnomes@lxorguk.ukuu.org.uk>,
	Mario Limonciello <mario.limonciello@dell.com>
Subject: [PATCH v10 02/15] platform/x86: dell-wmi: increase severity of some failures
Date: Thu, 19 Oct 2017 12:50:05 -0500	[thread overview]
Message-ID: <75232bbc211473e2bc8aa09067c4e0bd5fc719a9.1508434513.git.mario.limonciello@dell.com> (raw)
In-Reply-To: <cover.1508434513.git.mario.limonciello@dell.com>
In-Reply-To: <cover.1508434513.git.mario.limonciello@dell.com>

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>
---
 drivers/platform/x86/dell-wmi.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 1fbef560ca67..2cfaaa8faf0a 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -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",
-- 
2.14.1

  parent reply	other threads:[~2017-10-19 17:50 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-19 17:50 [PATCH v10 00/15] Introduce support for Dell SMBIOS over WMI Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 01/15] platform/x86: wmi: Add new method wmidev_evaluate_method Mario Limonciello
2017-10-19 17:50 ` Mario Limonciello [this message]
2017-10-19 17:50 ` [PATCH v10 03/15] platform/x86: dell-wmi: clean up wmi descriptor check Mario Limonciello
2017-10-19 17:55   ` Pali Rohár
2017-10-19 17:50 ` [PATCH v10 04/15] platform/x86: dell-wmi: don't check length returned Mario Limonciello
2017-10-19 17:56   ` Pali Rohár
2017-10-19 17:50 ` [PATCH v10 05/15] platform/x86: dell-wmi-descriptor: split WMI descriptor into it's own driver Mario Limonciello
2017-10-19 18:06   ` Pali Rohár
2017-10-19 17:50 ` [PATCH v10 06/15] platform/x86: wmi: Don't allow drivers to get each other's GUIDs Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 07/15] platform/x86: dell-smbios: only run if proper oem string is detected Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 08/15] platform/x86: dell-smbios: Add a sysfs interface for SMBIOS tokens Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 09/15] platform/x86: dell-smbios: Introduce dispatcher for SMM calls Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 10/15] platform/x86: dell-smbios-wmi: Add new WMI dispatcher driver Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 11/15] platform/x86: dell-smbios-smm: test for WSMT Mario Limonciello
2017-10-19 18:09   ` Pali Rohár
2017-10-19 18:12     ` Mario.Limonciello
2017-10-19 22:46       ` Darren Hart
2017-10-19 17:50 ` [PATCH v10 12/15] platform/x86: dell-smbios: Add filtering support Mario Limonciello
2018-01-05 11:13   ` Pali Rohár
2018-01-05 14:32     ` Mario.Limonciello
2018-01-05 14:44       ` Pali Rohár
2018-01-05 14:48         ` Mario.Limonciello
2018-01-27 14:51           ` Pali Rohár
2018-01-29 16:22             ` Mario.Limonciello
2018-01-29 16:44               ` Pali Rohár
2018-01-05 14:44       ` Andy Shevchenko
2017-10-19 17:50 ` [PATCH v10 13/15] platform/x86: wmi: create userspace interface for drivers Mario Limonciello
2017-10-20 13:21   ` Greg KH
2017-10-20 13:54     ` Mario.Limonciello
2017-10-20 14:48       ` Christoph Hellwig
2017-10-20 15:07         ` Mario.Limonciello
2017-10-20 15:08           ` Christoph Hellwig
2017-10-20 15:31             ` Mario.Limonciello
2017-10-20 14:57       ` Greg KH
2017-10-20 13:22   ` Greg KH
2017-10-20 13:54     ` Mario.Limonciello
2017-10-20 13:23   ` Greg KH
2017-10-20 14:15     ` Mario.Limonciello
2017-10-19 17:50 ` [PATCH v10 14/15] platform/x86: dell-smbios-wmi: introduce userspace interface Mario Limonciello
2017-10-19 17:50 ` [PATCH v10 15/15] tools/wmi: add a sample for dell smbios communication over WMI Mario Limonciello
2017-11-09  9:52 ` [PATCH v10 00/15] Introduce support for Dell SMBIOS " Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=75232bbc211473e2bc8aa09067c4e0bd5fc719a9.1508434513.git.mario.limonciello@dell.com \
    --to=mario.limonciello@dell.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=dvhart@infradead.org \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=greg@kroah.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mjg59@google.com \
    --cc=pali.rohar@gmail.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=quasisec@google.com \
    --cc=rjw@rjwysocki.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).