4.4-stable patches

added patches:
	char-drop-bogus-dependency-of-devport-on-m68k.patch
	char-lack-of-bool-string-made-config_devport-always-on.patch

diff --git a/queue-4.4/char-drop-bogus-dependency-of-devport-on-m68k.patch b/queue-4.4/char-drop-bogus-dependency-of-devport-on-m68k.patch
new file mode 100644 (file)
index 0000000..0f84923
--- /dev/null
+++ b/queue-4.4/char-drop-bogus-dependency-of-devport-on-m68k.patch
@@ -0,0 +1,40 @@
+From 309124e2648d668a0c23539c5078815660a4a850 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+Date: Mon, 11 Apr 2016 10:40:55 +0200
+Subject: char: Drop bogus dependency of DEVPORT on !M68K
+
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+
+commit 309124e2648d668a0c23539c5078815660a4a850 upstream.
+
+According to full-history-linux commit d3794f4fa7c3edc3 ("[PATCH] M68k
+update (part 25)"), port operations are allowed on m68k if CONFIG_ISA is
+defined.
+
+However, commit 153dcc54df826d2f ("[PATCH] mem driver: fix conditional
+on isa i/o support") accidentally changed an "||" into an "&&",
+disabling it completely on m68k. This logic was retained when
+introducing the DEVPORT symbol in commit 4f911d64e04a44c4 ("Make
+/dev/port conditional on config symbol").
+
+Drop the bogus dependency on !M68K to fix this.
+
+Fixes: 153dcc54df826d2f ("[PATCH] mem driver: fix conditional on isa i/o support")
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Tested-by: Al Stone <ahs3@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/char/Kconfig |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -584,7 +584,6 @@ config TELCLOCK
+ 
+ config DEVPORT
+       bool
+-      depends on !M68K
+       depends on ISA || PCI
+       default y
+ 

diff --git a/queue-4.4/char-lack-of-bool-string-made-config_devport-always-on.patch b/queue-4.4/char-lack-of-bool-string-made-config_devport-always-on.patch
new file mode 100644 (file)
index 0000000..8a10782
--- /dev/null
+++ b/queue-4.4/char-lack-of-bool-string-made-config_devport-always-on.patch
@@ -0,0 +1,39 @@
+From f2cfa58b136e4b06a9b9db7af5ef62fbb5992f62 Mon Sep 17 00:00:00 2001
+From: Max Bires <jbires@google.com>
+Date: Tue, 3 Jan 2017 08:18:07 -0800
+Subject: char: lack of bool string made CONFIG_DEVPORT always on
+
+From: Max Bires <jbires@google.com>
+
+commit f2cfa58b136e4b06a9b9db7af5ef62fbb5992f62 upstream.
+
+Without a bool string present, using "# CONFIG_DEVPORT is not set" in
+defconfig files would not actually unset devport. This esnured that
+/dev/port was always on, but there are reasons a user may wish to
+disable it (smaller kernel, attack surface reduction) if it's not being
+used. Adding a message here in order to make this user visible.
+
+Signed-off-by: Max Bires <jbires@google.com>
+Acked-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/char/Kconfig |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -583,9 +583,12 @@ config TELCLOCK
+         controlling the behavior of this hardware.
+ 
+ config DEVPORT
+-      bool
++      bool "/dev/port character device"
+       depends on ISA || PCI
+       default y
++      help
++        Say Y here if you want to support the /dev/port device. The /dev/port
++        device is similar to /dev/mem, but for I/O ports.
+ 
+ source "drivers/s390/char/Kconfig"
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index 4ed68eb545a2dddbfa148b7dfe6cdef71e58a971..c4c05fff35a131eb82c7666e2e18d6e76b4b9c04 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -19,3 +19,5 @@ xen-fbfront-fix-connecting-to-backend.patch
 libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handle-lockdep-splat.patch
 irqchip-irq-imx-gpcv2-fix-spinlock-initialization.patch
 ftrace-fix-removing-of-second-function-probe.patch
+char-drop-bogus-dependency-of-devport-on-m68k.patch
+char-lack-of-bool-string-made-config_devport-always-on.patch