linux-kernel - [tip:x86/urgent] input: i8042 - add runtime check in x86's i8042_platform

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 8 Jul 2010 07:17:15 GMT
From:	tip-bot for Feng Tang <feng.tang@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	tony.luck@...el.com, dtor@...l.ru, tglx@...utronix.de,
	feng.tang@...el.com, hpa@...ux.intel.com
Subject: [tip:x86/urgent] input: i8042 - add runtime check in x86's i8042_platform_init

Commit-ID:  5cdfa1c3bbabb809ef3134f741a63e13373a8cad
Gitweb:     http://git.kernel.org/tip/5cdfa1c3bbabb809ef3134f741a63e13373a8cad
Author:     Feng Tang <feng.tang@...el.com>
AuthorDate: Wed, 7 Jul 2010 13:02:16 -0700
Committer:  H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Wed, 7 Jul 2010 17:05:07 -0700

input: i8042 - add runtime check in x86's i8042_platform_init

Then it will first check x86_platforms's i8042 detection result,
then go on with normal probe.

Signed-off-by: Feng Tang <feng.tang@...el.com>
LKML-Reference: <4c34dd482753bb8f1@...uck-desktop.sc.intel.com>
Signed-off-by: Tony Luck <tony.luck@...el.com>
Acked-by: Dmitry Torokhov <dtor@...l.ru>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
 drivers/input/serio/i8042-x86ia64io.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6168469..81003c4 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -7,6 +7,10 @@
  * the Free Software Foundation.
  */
 
+#ifdef CONFIG_X86
+#include <asm/x86_init.h>
+#endif
+
 /*
  * Names.
  */
@@ -840,6 +844,12 @@ static int __init i8042_platform_init(void)
 {
 	int retval;
 
+#ifdef CONFIG_X86
+	/* Just return if pre-detection shows no i8042 controller exist */
+	if (!x86_platform.i8042_detect())
+		return -ENODEV;
+#endif
+
 /*
  * On ix86 platforms touching the i8042 data register region can do really
  * bad things. Because of this the region is always reserved on ix86 boxes.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/