Skip to content

Commit f482aa9

Browse files
peilin-yeaxboe
authored andcommitted
audit, io_uring, io-wq: Fix memory leak in io_sq_thread() and io_wqe_worker()
Currently @audit_context is allocated twice for io_uring workers: 1. copy_process() calls audit_alloc(); 2. io_sq_thread() or io_wqe_worker() calls audit_alloc_kernel() (which is effectively audit_alloc()) and overwrites @audit_context, causing: BUG: memory leak unreferenced object 0xffff888144547400 (size 1024): <...> hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8135cfc3>] audit_alloc+0x133/0x210 [<ffffffff81239e63>] copy_process+0xcd3/0x2340 [<ffffffff8123b5f3>] create_io_thread+0x63/0x90 [<ffffffff81686604>] create_io_worker+0xb4/0x230 [<ffffffff81686f68>] io_wqe_enqueue+0x248/0x3b0 [<ffffffff8167663a>] io_queue_iowq+0xba/0x200 [<ffffffff816768b3>] io_queue_async+0x113/0x180 [<ffffffff816840df>] io_req_task_submit+0x18f/0x1a0 [<ffffffff816841cd>] io_apoll_task_func+0xdd/0x120 [<ffffffff8167d49f>] tctx_task_work+0x11f/0x570 [<ffffffff81272c4e>] task_work_run+0x7e/0xc0 [<ffffffff8125a688>] get_signal+0xc18/0xf10 [<ffffffff8111645b>] arch_do_signal_or_restart+0x2b/0x730 [<ffffffff812ea44e>] exit_to_user_mode_prepare+0x5e/0x180 [<ffffffff844ae1b2>] syscall_exit_to_user_mode+0x12/0x20 [<ffffffff844a7e80>] do_syscall_64+0x40/0x80 Then, 3. io_sq_thread() or io_wqe_worker() frees @audit_context using audit_free(); 4. do_exit() eventually calls audit_free() again, which is okay because audit_free() does a NULL check. As suggested by Paul Moore, fix it by deleting audit_alloc_kernel() and redundant audit_free() calls. Fixes: 5bd2182 ("audit,io_uring,io-wq: add some basic audit support to io_uring") Suggested-by: Paul Moore <[email protected]> Cc: [email protected] Signed-off-by: Peilin Ye <[email protected]> Acked-by: Paul Moore <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent ff2557b commit f482aa9

File tree

4 files changed

+0
-37
lines changed

4 files changed

+0
-37
lines changed

include/linux/audit.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ static inline int audit_signal_info(int sig, struct task_struct *t)
285285
/* These are defined in auditsc.c */
286286
/* Public API */
287287
extern int audit_alloc(struct task_struct *task);
288-
extern int audit_alloc_kernel(struct task_struct *task);
289288
extern void __audit_free(struct task_struct *task);
290289
extern void __audit_uring_entry(u8 op);
291290
extern void __audit_uring_exit(int success, long code);
@@ -578,10 +577,6 @@ static inline int audit_alloc(struct task_struct *task)
578577
{
579578
return 0;
580579
}
581-
static inline int audit_alloc_kernel(struct task_struct *task)
582-
{
583-
return 0;
584-
}
585580
static inline void audit_free(struct task_struct *task)
586581
{ }
587582
static inline void audit_uring_entry(u8 op)

io_uring/io-wq.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,6 @@ static int io_wqe_worker(void *data)
624624
snprintf(buf, sizeof(buf), "iou-wrk-%d", wq->task->pid);
625625
set_task_comm(current, buf);
626626

627-
audit_alloc_kernel(current);
628-
629627
while (!test_bit(IO_WQ_BIT_EXIT, &wq->state)) {
630628
long ret;
631629

@@ -660,7 +658,6 @@ static int io_wqe_worker(void *data)
660658
if (test_bit(IO_WQ_BIT_EXIT, &wq->state))
661659
io_worker_handle_work(worker);
662660

663-
audit_free(current);
664661
io_worker_exit(worker);
665662
return 0;
666663
}

io_uring/sqpoll.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ static int io_sq_thread(void *data)
235235
set_cpus_allowed_ptr(current, cpu_online_mask);
236236
current->flags |= PF_NO_SETAFFINITY;
237237

238-
audit_alloc_kernel(current);
239-
240238
mutex_lock(&sqd->lock);
241239
while (1) {
242240
bool cap_entries, sqt_spin = false;
@@ -310,8 +308,6 @@ static int io_sq_thread(void *data)
310308
io_run_task_work();
311309
mutex_unlock(&sqd->lock);
312310

313-
audit_free(current);
314-
315311
complete(&sqd->exited);
316312
do_exit(0);
317313
}

kernel/auditsc.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,31 +1073,6 @@ int audit_alloc(struct task_struct *tsk)
10731073
return 0;
10741074
}
10751075

1076-
/**
1077-
* audit_alloc_kernel - allocate an audit_context for a kernel task
1078-
* @tsk: the kernel task
1079-
*
1080-
* Similar to the audit_alloc() function, but intended for kernel private
1081-
* threads. Returns zero on success, negative values on failure.
1082-
*/
1083-
int audit_alloc_kernel(struct task_struct *tsk)
1084-
{
1085-
/*
1086-
* At the moment we are just going to call into audit_alloc() to
1087-
* simplify the code, but there two things to keep in mind with this
1088-
* approach:
1089-
*
1090-
* 1. Filtering internal kernel tasks is a bit laughable in almost all
1091-
* cases, but there is at least one case where there is a benefit:
1092-
* the '-a task,never' case allows the admin to effectively disable
1093-
* task auditing at runtime.
1094-
*
1095-
* 2. The {set,clear}_task_syscall_work() ops likely have zero effect
1096-
* on these internal kernel tasks, but they probably don't hurt either.
1097-
*/
1098-
return audit_alloc(tsk);
1099-
}
1100-
11011076
static inline void audit_free_context(struct audit_context *context)
11021077
{
11031078
/* resetting is extra work, but it is likely just noise */

0 commit comments

Comments
 (0)