Skip to content

Commit caeb4b0

Browse files
Kent Overstreetbrauner
authored andcommitted
aio: Fix null ptr deref in aio_complete() wakeup
list_del_init_careful() needs to be the last access to the wait queue entry - it effectively unlocks access. Previously, finish_wait() would see the empty list head and skip taking the lock, and then we'd return - but the completion path would still attempt to do the wakeup after the task_struct pointer had been overwritten. Fixes: 71eb6b6 ("fs/aio: obey min_nr when doing wakeups") Cc: [email protected] Link: https://lore.kernel.org/linux-fsdevel/CAHTA-ubfwwB51A5Wg5M6H_rPEQK9pNf8FkAGH=vr=FEkyRrtqw@mail.gmail.com/ Signed-off-by: Kent Overstreet <[email protected]> Link: https://lore.kernel.org/stable/20240331215212.522544-1-kent.overstreet%40linux.dev Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent 22650a9 commit caeb4b0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/aio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,8 +1202,8 @@ static void aio_complete(struct aio_kiocb *iocb)
12021202
spin_lock_irqsave(&ctx->wait.lock, flags);
12031203
list_for_each_entry_safe(curr, next, &ctx->wait.head, w.entry)
12041204
if (avail >= curr->min_nr) {
1205-
list_del_init_careful(&curr->w.entry);
12061205
wake_up_process(curr->w.private);
1206+
list_del_init_careful(&curr->w.entry);
12071207
}
12081208
spin_unlock_irqrestore(&ctx->wait.lock, flags);
12091209
}

0 commit comments

Comments
 (0)