3.18-stable patches

added patches:
	serial-ifx6x60-fix-use-after-free-on-module-unload.patch

diff --git a/queue-3.18/serial-ifx6x60-fix-use-after-free-on-module-unload.patch b/queue-3.18/serial-ifx6x60-fix-use-after-free-on-module-unload.patch
new file mode 100644 (file)
index 0000000..424137d
--- /dev/null
+++ b/queue-3.18/serial-ifx6x60-fix-use-after-free-on-module-unload.patch
@@ -0,0 +1,35 @@
+From 1e948479b3d63e3ac0ecca13cbf4921c7d17c168 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan@kernel.org>
+Date: Wed, 26 Apr 2017 12:24:21 +0200
+Subject: serial: ifx6x60: fix use-after-free on module unload
+
+From: Johan Hovold <johan@kernel.org>
+
+commit 1e948479b3d63e3ac0ecca13cbf4921c7d17c168 upstream.
+
+Make sure to deregister the SPI driver before releasing the tty driver
+to avoid use-after-free in the SPI remove callback where the tty
+devices are deregistered.
+
+Fixes: 72d4724ea54c ("serial: ifx6x60: Add modem power off function in the platform reboot process")
+Cc: Jun Chen <jun.d.chen@intel.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/ifx6x60.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/tty/serial/ifx6x60.c
++++ b/drivers/tty/serial/ifx6x60.c
+@@ -1379,9 +1379,9 @@ static struct spi_driver ifx_spi_driver
+ static void __exit ifx_spi_exit(void)
+ {
+       /* unregister */
++      spi_unregister_driver((void *)&ifx_spi_driver);
+       tty_unregister_driver(tty_drv);
+       put_tty_driver(tty_drv);
+-      spi_unregister_driver((void *)&ifx_spi_driver);
+       unregister_reboot_notifier(&ifx_modem_reboot_notifier_block);
+ }
+ 

diff --git a/queue-3.18/series b/queue-3.18/series
index 693e9fd57424734157d29356aa9fa0a9b4c4dd43..eb862ca902977ab5acc89e6b232d977b242a606b 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -5,3 +5,4 @@ tcp-disallow-cwnd-undo-when-switching-congestion-control.patch
 ipv6-fix-leak-in-ipv6_gso_segment.patch
 net-ping-do-not-abuse-udp_poll.patch
 net-ethoc-enable-napi-before-poll-may-be-scheduled.patch
+serial-ifx6x60-fix-use-after-free-on-module-unload.patch