]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
io_uring/waitid: clear waitid info before copying it to userspace
authorHeechan Kang <gganji11@naver.com>
Sat, 16 May 2026 18:47:09 +0000 (03:47 +0900)
committerJens Axboe <axboe@kernel.dk>
Sat, 16 May 2026 18:58:21 +0000 (12:58 -0600)
IORING_OP_WAITID stores its result fields in struct io_waitid::info and
later copies them to userspace siginfo. The prep path initializes the
request arguments, but it does not initialize info itself.

If the wait operation completes without reporting a child event, the common
wait code can return without writing wo_info. In that case io_waitid_finish()
still copies iw->info to userspace, exposing stale bytes from the reused
io_kiocb command storage.

Clear the result storage during prep so the io_uring path matches the
regular waitid syscall, which uses a zero-initialized struct waitid_info.

Fixes: f31ecf671ddc ("io_uring: add IORING_OP_WAITID support")
Cc: stable@vger.kernel.org # 6.7+
Signed-off-by: Heechan Kang <gganji11@naver.com>
Link: https://patch.msgid.link/20260516184709.852814-1-gganji11@naver.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/waitid.c

index d25d60aed6afc8624ea558459c41163c64784808..32f68fd7fcddaa9363de149fa810cc3b47f73c06 100644 (file)
@@ -275,6 +275,7 @@ int io_waitid_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        iw->options = READ_ONCE(sqe->file_index);
        iw->head = NULL;
        iw->infop = u64_to_user_ptr(READ_ONCE(sqe->addr2));
+       memset(&iw->info, 0, sizeof(iw->info));
        return 0;
 }