3.18-stable patches

added patches:
	loop-fix-concurrent-lo_open-lo_release.patch

diff --git a/queue-3.18/loop-fix-concurrent-lo_open-lo_release.patch b/queue-3.18/loop-fix-concurrent-lo_open-lo_release.patch
new file mode 100644 (file)
index 0000000..8b8c12f
--- /dev/null
+++ b/queue-3.18/loop-fix-concurrent-lo_open-lo_release.patch
@@ -0,0 +1,57 @@
+From ae6650163c66a7eff1acd6eb8b0f752dcfa8eba5 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Fri, 5 Jan 2018 16:26:00 -0800
+Subject: loop: fix concurrent lo_open/lo_release
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit ae6650163c66a7eff1acd6eb8b0f752dcfa8eba5 upstream.
+
+范龙飞 reports that KASAN can report a use-after-free in __lock_acquire.
+The reason is due to insufficient serialization in lo_release(), which
+will continue to use the loop device even after it has decremented the
+lo_refcnt to zero.
+
+In the meantime, another process can come in, open the loop device
+again as it is being shut down. Confusion ensues.
+
+Reported-by: 范龙飞 <long7573@126.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/block/loop.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -1512,9 +1512,8 @@ out:
+       return err;
+ }
+ 
+-static void lo_release(struct gendisk *disk, fmode_t mode)
++static void __lo_release(struct loop_device *lo)
+ {
+-      struct loop_device *lo = disk->private_data;
+       int err;
+ 
+       mutex_lock(&lo->lo_ctl_mutex);
+@@ -1542,6 +1541,13 @@ out:
+       mutex_unlock(&lo->lo_ctl_mutex);
+ }
+ 
++static void lo_release(struct gendisk *disk, fmode_t mode)
++{
++      mutex_lock(&loop_index_mutex);
++      __lo_release(disk->private_data);
++      mutex_unlock(&loop_index_mutex);
++}
++
+ static const struct block_device_operations lo_fops = {
+       .owner =        THIS_MODULE,
+       .open =         lo_open,

diff --git a/queue-3.18/series b/queue-3.18/series
index 3cf39b7e56974c5d3c4cdb4469106a9642cae297..aa5637978870224c999d175519be41ad5c00a61a 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -2,3 +2,4 @@ input-do-not-emit-unneeded-ev_syn-when-suspending.patch
 um-link-vmlinux-with-no-pie.patch
 um-stop-abusing-__kernel__.patch
 um-remove-copy-paste-code-from-init.h.patch
+loop-fix-concurrent-lo_open-lo_release.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index a2207f63eadadbe4a79366cb08a72c252ef11c3b..c73cfdb8c51381a80849ba3e7a3ed29a0006a35b 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1 +1,2 @@
 futex-fix-owner_dead-fixup.patch
+loop-fix-concurrent-lo_open-lo_release.patch

diff --git a/queue-4.15/series b/queue-4.15/series
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644 (file)
index 0000000..f87e6b5
--- /dev/null
+++ b/queue-4.4/series
@@ -0,0 +1 @@
+loop-fix-concurrent-lo_open-lo_release.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f87e6b5e7222cc5d25f658be5a5ce104853e65ae 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -0,0 +1 @@
+loop-fix-concurrent-lo_open-lo_release.patch