aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2017-03-18 20:47:20 +0000
committerBen Hutchings <ben@decadent.org.uk>2017-03-18 20:51:22 +0000
commit73b2f137b649828d32b7b6a6eb925aeb2ee9c492 (patch)
tree1f0aaebfe1ae29a87155879a2c4d004a0e7ceae3
parent15269fa16f1daa1365825bc60577ed0f240edcc6 (diff)
downloadkernel_replicant_linux-73b2f137b649828d32b7b6a6eb925aeb2ee9c492.tar.gz
kernel_replicant_linux-73b2f137b649828d32b7b6a6eb925aeb2ee9c492.tar.bz2
kernel_replicant_linux-73b2f137b649828d32b7b6a6eb925aeb2ee9c492.zip
fjes: Disable auto-loading, as this driver matches a very common ACPI ID (Closes: #853976)
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/debian/fjes-disable-autoload.patch23
-rw-r--r--debian/patches/series1
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d83b70ecf0dc..3a6a1bfebc54 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 000000000000..0461fadb07e8
--- /dev/null
+++ b/debian/patches/debian/fjes-disable-autoload.patch
@@ -0,0 +1,23 @@
+From: Ben Hutchings <ben@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 9bb5e6be4e14..e8baa5c4acd6 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