lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 20 Oct 2017 12:40:18 -0500 From: Mario Limonciello <mario.limonciello@...l.com> To: dvhart@...radead.org, Andy Shevchenko <andy.shevchenko@...il.com> Cc: LKML <linux-kernel@...r.kernel.org>, platform-driver-x86@...r.kernel.org, Andy Lutomirski <luto@...nel.org>, quasisec@...gle.com, pali.rohar@...il.com, rjw@...ysocki.net, mjg59@...gle.com, hch@....de, Greg KH <greg@...ah.com>, Alan Cox <gnomes@...rguk.ukuu.org.uk>, Mario Limonciello <mario.limonciello@...l.com> Subject: [PATCH v11 03/15] platform/x86: dell-wmi: clean up wmi descriptor check Some cases the wrong type was used for errors and checks can be done more cleanly. Signed-off-by: Mario Limonciello <mario.limonciello@...l.com> Reviewed-by: Edward O'Callaghan <quasisec@...gle.com> Suggested-by: Andy Shevchenko <andy.shevchenko@...il.com> Reviewed-by: Pali Rohár <pali.rohar@...il.com> --- drivers/platform/x86/dell-wmi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 2cfaaa8faf0a..b2bd396acac5 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -663,16 +663,16 @@ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev) buffer = (u32 *)obj->buffer.pointer; - if (buffer[0] != 0x4C4C4544 && buffer[1] != 0x494D5720) { - dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%*ph)\n", - 8, buffer); + if (strncmp(obj->string.pointer, "DELL WMI", 8) != 0) { + dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%8ph)\n", + buffer); ret = -EINVAL; goto out; } if (buffer[2] != 0 && buffer[2] != 1) - dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%d)\n", - buffer[2]); + dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%lu)\n", + (unsigned long) buffer[2]); if (buffer[3] != 4096) dev_warn(&wdev->dev, "Dell descriptor buffer has invalid buffer length (%d)\n", -- 2.14.1
Powered by blists - more mailing lists