4.4-stable patches

added patches:
	fix-io_destroy-aio_complete-race.patch

diff --git a/queue-4.4/fix-io_destroy-aio_complete-race.patch b/queue-4.4/fix-io_destroy-aio_complete-race.patch
new file mode 100644 (file)
index 0000000..e1d9362
--- /dev/null
+++ b/queue-4.4/fix-io_destroy-aio_complete-race.patch
@@ -0,0 +1,42 @@
+From 4faa99965e027cc057c5145ce45fa772caa04e8d Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Wed, 23 May 2018 22:53:22 -0400
+Subject: fix io_destroy()/aio_complete() race
+
+From: Al Viro <viro@zeniv.linux.org.uk>
+
+commit 4faa99965e027cc057c5145ce45fa772caa04e8d upstream.
+
+If io_destroy() gets to cancelling everything that can be cancelled and
+gets to kiocb_cancel() calling the function driver has left in ->ki_cancel,
+it becomes vulnerable to a race with IO completion.  At that point req
+is already taken off the list and aio_complete() does *NOT* spin until
+we (in free_ioctx_users()) releases ->ctx_lock.  As the result, it proceeds
+to kiocb_free(), freing req just it gets passed to ->ki_cancel().
+
+Fix is simple - remove from the list after the call of kiocb_cancel().  All
+instances of ->ki_cancel() already have to cope with the being called with
+iocb still on list - that's what happens in io_cancel(2).
+
+Cc: stable@kernel.org
+Fixes: 0460fef2a921 "aio: use cancellation list lazily"
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/aio.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -628,9 +628,8 @@ static void free_ioctx_users(struct perc
+       while (!list_empty(&ctx->active_reqs)) {
+               req = list_first_entry(&ctx->active_reqs,
+                                      struct aio_kiocb, ki_list);
+-
+-              list_del_init(&req->ki_list);
+               kiocb_cancel(req);
++              list_del_init(&req->ki_list);
+       }
+ 
+       spin_unlock_irq(&ctx->ctx_lock);

diff --git a/queue-4.4/series b/queue-4.4/series
index 24704fde9efb5017ce50bbc34d37b93bdb467029..a74ebdec6e246d25b176ccc1a7f6f3f91099d865 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -30,4 +30,5 @@ stm-class-use-vmalloc-for-the-master-map.patch
 hwtracing-stm-fix-build-error-on-some-arches.patch
 drm-i915-disable-lvds-on-radiant-p845.patch
 kbuild-change-cc_optimize_for_size-definition.patch
+fix-io_destroy-aio_complete-race.patch
 sparc64-fix-build-warnings-with-gcc-7.patch