[linux] 01/01: fjes: Disable auto-loading, as this driver matches a very common ACPI ID (Closes: #853976)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 73b2f137b649828d32b7b6a6eb925aeb2ee9c492
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Mar 18 20:47:20 2017 +0000

    fjes: Disable auto-loading, as this driver matches a very common ACPI ID (Closes: #853976)
---
 debian/changelog                                  |  2 ++
 debian/patches/debian/fjes-disable-autoload.patch | 23 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d83b70e..3a6a1bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -149,6 +149,8 @@ linux (4.9.14-1) UNRELEASED; urgency=medium
   * ucount: Remove the atomicity from ucount->count (CVE-2017-6874)
   * userns: Avoid ABI change for CVE-2017-6874 fix
   * [amd64] Don't WARN about expected W+X pages on Xen (see #852324)
+  * fjes: Disable auto-loading, as this driver matches a very common ACPI ID
+    (Closes: #853976)
 
   [ Salvatore Bonaccorso ]
   * ACPI / EC: Use busy polling mode when GPE is not enabled.
diff --git a/debian/patches/debian/fjes-disable-autoload.patch b/debian/patches/debian/fjes-disable-autoload.patch
new file mode 100644
index 0000000..0461fad
--- /dev/null
+++ b/debian/patches/debian/fjes-disable-autoload.patch
@@ -0,0 +1,23 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 18 Mar 2017 20:47:58 +0000
+Subject: fjes: Disable auto-loading
+Bug-Debian: https://bugs.debian.org/853976
+
+fjes matches a generic ACPI device ID, and relies on its probe
+function to distinguish whether that really corresponds to a supported
+device.  Very few system will need the driver and it wastes memory on
+all the other systems where the same device ID appears, so disable
+auto-loading.
+
+---
+--- a/drivers/net/fjes/fjes_main.c
++++ b/drivers/net/fjes/fjes_main.c
+@@ -81,7 +81,7 @@ static const struct acpi_device_id fjes_
+ 	{"PNP0C02", 0},
+ 	{"", 0},
+ };
+-MODULE_DEVICE_TABLE(acpi, fjes_acpi_ids);
++/* MODULE_DEVICE_TABLE(acpi, fjes_acpi_ids); */
+ 
+ static struct acpi_driver fjes_acpi_driver = {
+ 	.name = DRV_NAME,
diff --git a/debian/patches/series b/debian/patches/series
index 9bb5e6b..e8baa5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,6 +42,7 @@ features/all/security-perf-allow-further-restriction-of-perf_event_open.patch
 debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
 debian/snd-pcsp-disable-autoload.patch
 bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
+debian/fjes-disable-autoload.patch
 
 # Taint if dangerous features are used
 debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git