From patchwork Thu Aug 25 18:50:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 9299665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 94F3D607D8 for ; Thu, 25 Aug 2016 18:51:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88D5F293EB for ; Thu, 25 Aug 2016 18:51:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B46F293F1; Thu, 25 Aug 2016 18:51:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97F2C293EB for ; Thu, 25 Aug 2016 18:51:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754459AbcHYSvA (ORCPT ); Thu, 25 Aug 2016 14:51:00 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:34994 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752629AbcHYSvA (ORCPT ); Thu, 25 Aug 2016 14:51:00 -0400 Received: by mail-oi0-f68.google.com with SMTP id e80so5271495oig.2; Thu, 25 Aug 2016 11:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=WX6L+scvv3Um9Rr29pQCOAPsEy3CJWVldMQ2r5PiUpc=; b=VyzO0+ZQjydv0t8pn+B04Q8RA5m7bMJHUyrqDnYe+mKO+bPFd/cAkhkycI3fs5hs8l iHaQ4Nuqvu3RXt4PXoUk0Vf1Euq0Rh/lXUlg8shhOzVSz1hUkzq98CP1TzCRhEQC07kS 6nlbrajrUTANB+YeLCRmGFwaTyBLVKP0lW+znrd2KTPHWwChLb9p5oikWAy3Z4oEuwYa f+aQ3aV1uKkmrgRkNYuSzeR9aQlIztuM/gcxAIUqbfUqGPXReV/gbXO/Jyuga5gbWQuH xrvijfLYw4UTMSC1LYrSidvrN3tO1Ci6m2YC6W1u6cC7R3oP2gviK61MNp5TAwWP3W2N 84Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WX6L+scvv3Um9Rr29pQCOAPsEy3CJWVldMQ2r5PiUpc=; b=ZWc//7PrGV0r5RYD/0i1Dwxda7cSxWSOFceYMHOK8sJn1+mrkvJtP2N398XpgQA2AC YECFYVfK0lXJXRF2uSe7YgoihSK7vrKIZ9wHxvI/H8eXHsK1emfOqXL3k+iCmnT20DPi 9dQRG/hhG5CNKUsnvSQ0ZDc6NeSSv0hHIaqhC2crJ8ykXNZ5DLZFFBv+fovBr3vLAG4n gP7+VH8mBQD1YmAQNmmtwkGzTISUgoya8Mq1lguah70JLkRvAlrtJaCwenLK/GtWXfOZ uzZuK+36CF0R5O3rqm0OYF3OA+1mDwXvkX7j3JgfUaeS/pGcvSt/gz8M/TfDq5Mj6G6j k2og== X-Gm-Message-State: AEkoouvcGnUYlqlBlqIgk0bElaB6F7XdICVsmmZZnHi5Skea5ZydNYHwy50rMSlC9JrJ7Q== X-Received: by 10.202.197.2 with SMTP id v2mr7441665oif.165.1472151059112; Thu, 25 Aug 2016 11:50:59 -0700 (PDT) Received: from Shakuras.scurra.org ([148.210.135.94]) by smtp.gmail.com with ESMTPSA id t12sm7075681ota.9.2016.08.25.11.50.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 11:50:58 -0700 (PDT) From: Azael Avalos To: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Azael Avalos Subject: [PATCH] toshiba-wmi: Fix loading the driver on non Toshiba laptops Date: Thu, 25 Aug 2016 12:50:55 -0600 Message-Id: <20160825185055.12143-1-coproscefalo@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Bug 150611 uncovered that the WMI ID used by the toshiba-wmi driver is not Toshiba specific, and as such, the driver was being loaded on non Toshiba laptops too. This patch adds a DMI matching list checking for TOSHIBA as the vendor, refusing to load if it is not. Also the WMI GUID was renamed, dropping the TOSHIBA_ prefix, to better reflect that such GUID is not a Toshiba specific one. Cc: # 4.4+ Signed-off-by: Azael Avalos --- Hi Darren, I was waiting on input from the bug above, but haven't received an answer (as of yet), so I decided to send this to the mailing list for feedback as to whether this is the correct approach for this issue. drivers/platform/x86/toshiba-wmi.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/toshiba-wmi.c b/drivers/platform/x86/toshiba-wmi.c index feac457..0c92887 100644 --- a/drivers/platform/x86/toshiba-wmi.c +++ b/drivers/platform/x86/toshiba-wmi.c @@ -24,14 +24,15 @@ #include #include #include +#include MODULE_AUTHOR("Azael Avalos"); MODULE_DESCRIPTION("Toshiba WMI Hotkey Driver"); MODULE_LICENSE("GPL"); -#define TOSHIBA_WMI_EVENT_GUID "59142400-C6A3-40FA-BADB-8A2652834100" +#define WMI_EVENT_GUID "59142400-C6A3-40FA-BADB-8A2652834100" -MODULE_ALIAS("wmi:"TOSHIBA_WMI_EVENT_GUID); +MODULE_ALIAS("wmi:"WMI_EVENT_GUID); static struct input_dev *toshiba_wmi_input_dev; @@ -63,6 +64,16 @@ static void toshiba_wmi_notify(u32 value, void *context) kfree(response.pointer); } +static struct dmi_system_id toshiba_wmi_dmi_table[] __initdata = { + { + .ident = "Toshiba laptop", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + }, + }, + {} +}; + static int __init toshiba_wmi_input_setup(void) { acpi_status status; @@ -81,7 +92,7 @@ static int __init toshiba_wmi_input_setup(void) if (err) goto err_free_dev; - status = wmi_install_notify_handler(TOSHIBA_WMI_EVENT_GUID, + status = wmi_install_notify_handler(WMI_EVENT_GUID, toshiba_wmi_notify, NULL); if (ACPI_FAILURE(status)) { err = -EIO; @@ -95,7 +106,7 @@ static int __init toshiba_wmi_input_setup(void) return 0; err_remove_notifier: - wmi_remove_notify_handler(TOSHIBA_WMI_EVENT_GUID); + wmi_remove_notify_handler(WMI_EVENT_GUID); err_free_keymap: sparse_keymap_free(toshiba_wmi_input_dev); err_free_dev: @@ -105,7 +116,7 @@ static int __init toshiba_wmi_input_setup(void) static void toshiba_wmi_input_destroy(void) { - wmi_remove_notify_handler(TOSHIBA_WMI_EVENT_GUID); + wmi_remove_notify_handler(WMI_EVENT_GUID); sparse_keymap_free(toshiba_wmi_input_dev); input_unregister_device(toshiba_wmi_input_dev); } @@ -114,7 +125,8 @@ static int __init toshiba_wmi_init(void) { int ret; - if (!wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) + if (!wmi_has_guid(WMI_EVENT_GUID) || + !dmi_check_system(toshiba_wmi_dmi_table)) return -ENODEV; ret = toshiba_wmi_input_setup(); @@ -130,7 +142,7 @@ static int __init toshiba_wmi_init(void) static void __exit toshiba_wmi_exit(void) { - if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) + if (wmi_has_guid(WMI_EVENT_GUID)) toshiba_wmi_input_destroy(); }