diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-09-13 13:09:39 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-09-30 20:32:32 -0600 |
| commit | 0f2122045b946241a9e549c2a76cea54fa58a7ff (patch) | |
| tree | 76cea5c487f38bff85e18933a8477b47d5514e05 /fs/file.c | |
| parent | e6c8aa9ac33bd7c968af7816240fc081401fddcd (diff) | |
| download | lwn-0f2122045b946241a9e549c2a76cea54fa58a7ff.tar.gz lwn-0f2122045b946241a9e549c2a76cea54fa58a7ff.zip | |
io_uring: don't rely on weak ->files references
Grab actual references to the files_struct. To avoid circular references
issues due to this, we add a per-task note that keeps track of what
io_uring contexts a task has used. When the tasks execs or exits its
assigned files, we cancel requests based on this tracking.
With that, we can grab proper references to the files table, and no
longer need to rely on stashing away ring_fd and ring_file to check
if the ring_fd may have been closed.
Cc: stable@vger.kernel.org # v5.5+
Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/file.c b/fs/file.c index 21c0893f2f1d..4559b5fec3bd 100644 --- a/fs/file.c +++ b/fs/file.c @@ -21,6 +21,7 @@ #include <linux/rcupdate.h> #include <linux/close_range.h> #include <net/sock.h> +#include <linux/io_uring.h> unsigned int sysctl_nr_open __read_mostly = 1024*1024; unsigned int sysctl_nr_open_min = BITS_PER_LONG; @@ -452,6 +453,7 @@ void exit_files(struct task_struct *tsk) struct files_struct * files = tsk->files; if (files) { + io_uring_files_cancel(files); task_lock(tsk); tsk->files = NULL; task_unlock(tsk); |