Commit 0bdbdd08 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: fix openat/statx's filename leak 



As in the previous patch, make openat*_prep() and statx_prep() handle
double preparation to avoid resource leakage.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5f798bea

fs/io_uring.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -2560,6 +2560,8 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
		return -EINVAL;

		return -EINVAL;

	if (sqe->flags & IOSQE_FIXED_FILE)

	if (sqe->flags & IOSQE_FIXED_FILE)

		return -EBADF;

		return -EBADF;

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;





	req->open.dfd = READ_ONCE(sqe->fd);

	req->open.dfd = READ_ONCE(sqe->fd);

	req->open.how.mode = READ_ONCE(sqe->len);

	req->open.how.mode = READ_ONCE(sqe->len);
@@ -2588,6 +2590,8 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
		return -EINVAL;

		return -EINVAL;

	if (sqe->flags & IOSQE_FIXED_FILE)

	if (sqe->flags & IOSQE_FIXED_FILE)

		return -EBADF;

		return -EBADF;

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;





	req->open.dfd = READ_ONCE(sqe->fd);

	req->open.dfd = READ_ONCE(sqe->fd);

	fname = u64_to_user_ptr(READ_ONCE(sqe->addr));

	fname = u64_to_user_ptr(READ_ONCE(sqe->addr));
@@ -2787,6 +2791,8 @@ static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
		return -EINVAL;

		return -EINVAL;

	if (sqe->flags & IOSQE_FIXED_FILE)

	if (sqe->flags & IOSQE_FIXED_FILE)

		return -EBADF;

		return -EBADF;

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;





	req->open.dfd = READ_ONCE(sqe->fd);

	req->open.dfd = READ_ONCE(sqe->fd);

	req->open.mask = READ_ONCE(sqe->len);

	req->open.mask = READ_ONCE(sqe->len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE