From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 3 Jun 2018 20:06:55 +0000 (+0200)
Subject: 4.16-stable patches
X-Git-Tag: v4.9.106~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baa41d46b4b7755562ba67b09e27e4f0f7b308fb;p=thirdparty%2Fkernel%2Fstable-queue.git

4.16-stable patches

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

diff --git a/queue-4.16/fix-io_destroy-aio_complete-race.patch b/queue-4.16/fix-io_destroy-aio_complete-race.patch
new file mode 100644
index 00000000000..3ee7ca74224
--- /dev/null
+++ b/queue-4.16/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
+@@ -643,9 +643,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.16/series b/queue-4.16/series
index 46977b4c8b2..75448ce1129 100644
--- a/queue-4.16/series
+++ b/queue-4.16/series
@@ -43,3 +43,4 @@ intel_th-use-correct-device-when-freeing-buffers.patch
 drm-psr-fix-missed-entry-in-psr-setup-time-table.patch
 drm-i915-lvds-move-acpi-lid-notification-registration-to-registration-phase.patch
 drm-i915-disable-lvds-on-radiant-p845.patch
+fix-io_destroy-aio_complete-race.patch