* [PATCH] io_uring: assign file_slot prior to calling io_sqe_file_register()
@ 2021-02-11 14:48 Jens Axboe
0 siblings, 0 replies; only message in thread
From: Jens Axboe @ 2021-02-11 14:48 UTC (permalink / raw)
To: io-uring
We use the assigned slot in io_sqe_file_register(), and a previous
patch moved the assignment to after we have called it. This isn't
super pretty, and will get cleaned up in the future. For now, fix
the regression by restoring the previous assignment/clear of the
file_slot.
Fixes: ea64ec02b31d ("io_uring: deduplicate file table slot calculation")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
diff --git a/fs/io_uring.c b/fs/io_uring.c
index f730af32c17a..cd9c4c05f6f5 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8112,12 +8112,13 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx,
err = -EBADF;
break;
}
+ *file_slot = file;
err = io_sqe_file_register(ctx, file, i);
if (err) {
+ *file_slot = NULL;
fput(file);
break;
}
- *file_slot = file;
}
}
--
Jens Axboe
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-11 14:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-11 14:48 [PATCH] io_uring: assign file_slot prior to calling io_sqe_file_register() Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).