From: Greg Kroah-Hartman Date: Tue, 18 Apr 2017 14:14:54 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v4.4.63~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10fbe4787684590b8a27450a6af325922c7c0622;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-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-3.18/char-drop-bogus-dependency-of-devport-on-m68k.patch b/queue-3.18/char-drop-bogus-dependency-of-devport-on-m68k.patch new file mode 100644 index 00000000000..ab4e931fb7f --- /dev/null +++ b/queue-3.18/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 +Date: Mon, 11 Apr 2016 10:40:55 +0200 +Subject: char: Drop bogus dependency of DEVPORT on !M68K + +From: Geert Uytterhoeven + +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 +Tested-by: Al Stone +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/char/Kconfig ++++ b/drivers/char/Kconfig +@@ -575,7 +575,6 @@ config TELCLOCK + + config DEVPORT + bool +- depends on !M68K + depends on ISA || PCI + default y + diff --git a/queue-3.18/char-lack-of-bool-string-made-config_devport-always-on.patch b/queue-3.18/char-lack-of-bool-string-made-config_devport-always-on.patch new file mode 100644 index 00000000000..0aed722a58b --- /dev/null +++ b/queue-3.18/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 +Date: Tue, 3 Jan 2017 08:18:07 -0800 +Subject: char: lack of bool string made CONFIG_DEVPORT always on + +From: Max Bires + +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 +Acked-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/Kconfig | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/char/Kconfig ++++ b/drivers/char/Kconfig +@@ -574,9 +574,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-3.18/series b/queue-3.18/series index d3c14010f3e..2fe274b82fe 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -10,3 +10,5 @@ scsi-sr-sanity-check-returned-mode-data.patch scsi-sd-fix-capacity-calculation-with-32-bit-sector_t.patch xen-fbfront-fix-connecting-to-backend.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