Skip to content

Commit

Permalink
fix io_destroy()/aio_complete() race
Browse files Browse the repository at this point in the history
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: [email protected]
Fixes: 0460fef "aio: use cancellation list lazily"
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed May 24, 2018
1 parent baf1056 commit 4faa999
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,9 +634,8 @@ static void free_ioctx_users(struct percpu_ref *ref)
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);
Expand Down

0 comments on commit 4faa999

Please sign in to comment.