Skip to content

Commit 300a77d

Browse files
committed
io_uring: Fix registered ring file refcount leak
JIRA: https://issues.redhat.com/browse/RHEL-105612 commit 12d9081 Author: Jann Horn <jannh@google.com> Date: Wed Dec 18 17:56:25 2024 +0100 io_uring: Fix registered ring file refcount leak Currently, io_uring_unreg_ringfd() (which cleans up registered rings) is only called on exit, but __io_uring_free (which frees the tctx in which the registered ring pointers are stored) is also called on execve (via begin_new_exec -> io_uring_task_cancel -> __io_uring_cancel -> io_uring_cancel_generic -> __io_uring_free). This means: A process going through execve while having registered rings will leak references to the rings' `struct file`. Fix it by zapping registered rings on execve(). This is implemented by moving the io_uring_unreg_ringfd() from io_uring_files_cancel() into its callee __io_uring_cancel(), which is called from io_uring_task_cancel() on execve. This could probably be exploited *on 32-bit kernels* by leaking 2^32 references to the same ring, because the file refcount is stored in a pointer-sized field and get_file() doesn't have protection against refcount overflow, just a WARN_ONCE(); but on 64-bit it should have no impact beyond a memory leak. Cc: stable@vger.kernel.org Fixes: e7a6c00 ("io_uring: add support for registering ring file descriptors") Signed-off-by: Jann Horn <jannh@google.com> Link: https://lore.kernel.org/r/20241218-uring-reg-ring-cleanup-v1-1-8f63e999045b@google.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
1 parent f04cd63 commit 300a77d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

include/linux/io_uring.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ const char *io_uring_get_opcode(u8 opcode);
1414

1515
static inline void io_uring_files_cancel(void)
1616
{
17-
if (current->io_uring) {
18-
io_uring_unreg_ringfd();
17+
if (current->io_uring)
1918
__io_uring_cancel(false);
20-
}
2119
}
2220
static inline void io_uring_task_cancel(void)
2321
{

io_uring/io_uring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3230,6 +3230,7 @@ __cold void io_uring_cancel_generic(bool cancel_all, struct io_sq_data *sqd)
32303230

32313231
void __io_uring_cancel(bool cancel_all)
32323232
{
3233+
io_uring_unreg_ringfd();
32333234
io_uring_cancel_generic(cancel_all, NULL);
32343235
}
32353236

0 commit comments

Comments
 (0)