Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGoldwyn Rodrigues <rgoldwyn@suse.com>2018-10-15 10:56:30 -0500
committerGoldwyn Rodrigues <rgoldwyn@suse.com>2018-10-15 10:56:37 -0500
commitfd44f084f8abdcc71ad9cda66a824636dcf64e91 (patch)
tree4a7d52751321682315121141e13101d1e20a41e1
parentff5cd46a98f49c7e38f8c7e8f55e17ec2b85311c (diff)
aio: fix io_destroy(2) vs. lookup_ioctx() race (git-fixes).
-rw-r--r--patches.fixes/aio-fix-io_destroy2-vs.-lookup_ioctx-race.patch66
-rw-r--r--series.conf1
2 files changed, 67 insertions, 0 deletions
diff --git a/patches.fixes/aio-fix-io_destroy2-vs.-lookup_ioctx-race.patch b/patches.fixes/aio-fix-io_destroy2-vs.-lookup_ioctx-race.patch
new file mode 100644
index 0000000000..13b80b0a36
--- /dev/null
+++ b/patches.fixes/aio-fix-io_destroy2-vs.-lookup_ioctx-race.patch
@@ -0,0 +1,66 @@
+From baf10564fbb66ea222cae66fbff11c444590ffd9 Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Sun May 20 16:46:23 2018 -0400
+Subject: [PATCH] aio: fix io_destroy(2) vs. lookup_ioctx() race
+Git-commit: baf10564fbb66ea222cae66fbff11c444590ffd9
+References: git-fixes
+Patch-mainline: v4.17-rc7
+
+kill_ioctx() used to have an explicit RCU delay between removing the
+reference from ->ioctx_table and percpu_ref_kill() dropping the refcount.
+At some point that delay had been removed, on the theory that
+percpu_ref_kill() itself contained an RCU delay. Unfortunately, that was
+the wrong kind of RCU delay and it didn't care about rcu_read_lock() used
+by lookup_ioctx(). As the result, we could get ctx freed right under
+lookup_ioctx(). Tejun has fixed that in a6d7cff472e ("fs/aio: Add explicit
+RCU grace period when freeing kioctx"); however, that fix is not enough.
+
+Suppose io_destroy() from one thread races with e.g. io_setup() from another;
+CPU1 removes the reference from current->mm->ioctx_table[...] just as CPU2
+has picked it (under rcu_read_lock()). Then CPU1 proceeds to drop the
+refcount, getting it to 0 and triggering a call of free_ioctx_users(),
+which proceeds to drop the secondary refcount and once that reaches zero
+calls free_ioctx_reqs(). That does
+ INIT_RCU_WORK(&ctx->free_rwork, free_ioctx);
+ queue_rcu_work(system_wq, &ctx->free_rwork);
+and schedules freeing the whole thing after RCU delay.
+
+In the meanwhile CPU2 has gotten around to percpu_ref_get(), bumping the
+refcount from 0 to 1 and returned the reference to io_setup().
+
+Tejun's fix (that queue_rcu_work() in there) guarantees that ctx won't get
+freed until after percpu_ref_get(). Sure, we'd increment the counter before
+ctx can be freed. Now we are out of rcu_read_lock() and there's nothing to
+stop freeing of the whole thing. Unfortunately, CPU2 assumes that since it
+has grabbed the reference, ctx is *NOT* going away until it gets around to
+dropping that reference.
+
+The fix is obvious - use percpu_ref_tryget_live() and treat failure as miss.
+It's not costlier than what we currently do in normal case, it's safe to
+call since freeing *is* delayed and it closes the race window - either
+lookup_ioctx() comes before percpu_ref_kill() (in which case ctx->users
+won't reach 0 until the caller of lookup_ioctx() drops it) or lookup_ioctx()
+fails, ctx->users is unaffected and caller of lookup_ioctx() doesn't see
+the object in question at all.
+
+Cc: stable@kernel.org
+Fixes: a6d7cff472e "fs/aio: Add explicit RCU grace period when freeing kioctx"
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Acked-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
+
+diff --git a/fs/aio.c b/fs/aio.c
+index 88d7927..8061d97 100644
+
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -1078,8 +1078,8 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
+
+ ctx = rcu_dereference(table->table[id]);
+ if (ctx && ctx->user_id == ctx_id) {
+- percpu_ref_get(&ctx->users);
+- ret = ctx;
++ if (percpu_ref_tryget_live(&ctx->users))
++ ret = ctx;
+ }
+ out:
+ rcu_read_unlock();
diff --git a/series.conf b/series.conf
index a1e56fdef5..4957484b90 100644
--- a/series.conf
+++ b/series.conf
@@ -15562,6 +15562,7 @@
patches.fixes/affs_lookup-close-a-race-with-affs_remove_link.patch
patches.fixes/befs_lookup-use-d_splice_alias.patch
patches.fixes/ext2-fix-a-block-leak.patch
+ patches.fixes/aio-fix-io_destroy2-vs.-lookup_ioctx-race.patch
patches.drivers/scsi-zfcp-fix-infinite-iteration-on-erp-ready-list.patch
patches.fixes/scsi-core-clean-up-generated-file-scsi_devinfo_tbl.c.patch
patches.drivers/scsi-sg-allocate-with-_gfp_zero-in-sg_build_indirect.patch