address resourse leaks
cover address resourse leaks
This fixes the last prep/submission-related leaking hole I found. The first patch is only for read/write/send/recv, so may be 5.5-ported if needed. The second one doing the same but for openat{,2} and statx.
Pavel Begunkov (2):
io_uring: fix double prep iovec leak
io_uring: fix openat/statx's filename leak
fs/io_uring.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/2 io_uring: fix double prep iovec leak
Requests may be prepared multiple times with ->io allocated (i.e. async prepared). Preparation functions doesn't handle it and forget about previously allocated resources. This may happen in case of:
- spurious defer_check
- non-head (i.e. async prepared) request executed in sync (via nxt).
Make the handlers to check, whether they already allocated resources, what is true IFF REQ_F_NEED_CLEANUP is set.
--- fs/io_uring.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/io_uring.c +10 -2
@@ -2187,7 +2187,8 @@ static int io_read_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,if (unlikely (!(req->file->f_mode &FMODE_READ )))return -EBADF ; -if (!req->io) +/* either don't need iovec imported or already have it */ +if (!req->io || req->flags &REQ_F_NEED_CLEANUP )return 0 ; io = req->io;
@@ -2275,7 +2276,8 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,if (unlikely (!(req->file->f_mode &FMODE_WRITE )))return -EBADF ; -if (!req->io) +/* either don't need iovec imported or already have it */ +if (!req->io || req->flags &REQ_F_NEED_CLEANUP )return 0 ; io = req->io;
@@ -2981,6 +2983,9 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)if (!io || req->opcode ==IORING_OP_SEND )return 0 ; +/* iovec is already imported */ +if (req->flags &REQ_F_NEED_CLEANUP ) +return 0 ; io->msg.iov = io->msg.fast_iov; ret = sendmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags,
@@ -3131,6 +3136,9 @@ static int io_recvmsg_prep(struct io_kiocb *req,if (!io || req->opcode ==IORING_OP_RECV )return 0 ; +/* iovec is already imported */ +if (req->flags &REQ_F_NEED_CLEANUP ) +return 0 ; io->msg.iov = io->msg.fast_iov; ret = recvmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags,
Signature · 1 line
2.24.0
PATCH 2/2 io_uring: fix openat/statx's filename leak
In reply to Pavel BegunkovAs in the previous patch, make openat*_prep() and statx_prep() to handle double prepartion to avoid resource leakage.
--- fs/io_uring.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/io_uring.c +6 -0
@@ -2536,6 +2536,8 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return -EINVAL ;if (sqe->flags &IOSQE_FIXED_FILE )return -EINVAL ; +if (req->flags &REQ_F_NEED_CLEANUP ) +return 0 ; req->open.dfd =READ_ONCE (sqe->fd); req->open.how.mode =READ_ONCE (sqe->len);
@@ -2564,6 +2566,8 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return -EINVAL ;if (sqe->flags &IOSQE_FIXED_FILE )return -EINVAL ; +if (req->flags &REQ_F_NEED_CLEANUP ) +return 0 ; req->open.dfd =READ_ONCE (sqe->fd); fname =u64_to_user_ptr (READ_ONCE (sqe->addr));
@@ -2763,6 +2767,8 @@ static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return -EINVAL ;if (sqe->flags &IOSQE_FIXED_FILE )return -EINVAL ; +if (req->flags &REQ_F_NEED_CLEANUP ) +return 0 ; req->open.dfd =READ_ONCE (sqe->fd); req->open.mask =READ_ONCE (sqe->len);
Signature · 1 line
2.24.0