io_uring: statx must grab the file table for valid fd (5b0bbee4) · Commits · 戴 / test

fs/io_uring.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -524,6 +524,7 @@ enum {
		REQ_F_OVERFLOW_BIT,
		REQ_F_POLLED_BIT,
		REQ_F_BUFFER_SELECTED_BIT,
		REQ_F_NO_FILE_TABLE_BIT,

		/* not a real bit, just to check we're not overflowing the space */
		__REQ_F_LAST_BIT,
		@@ -577,6 +578,8 @@ enum {
		REQ_F_POLLED = BIT(REQ_F_POLLED_BIT),
		/* buffer already selected */
		REQ_F_BUFFER_SELECTED = BIT(REQ_F_BUFFER_SELECTED_BIT),
		/* doesn't need file table for this request */
		REQ_F_NO_FILE_TABLE = BIT(REQ_F_NO_FILE_TABLE_BIT),
		};

		struct async_poll {
		@@ -799,6 +802,7 @@ static const struct io_op_def io_op_defs[] = {
		.needs_file = 1,
		.fd_non_neg = 1,
		.needs_fs = 1,
		.file_table = 1,
		},
		[IORING_OP_READ] = {
		.needs_mm = 1,
		@@ -3355,8 +3359,12 @@ static int io_statx(struct io_kiocb *req, bool force_nonblock)
		struct kstat stat;
		int ret;

		if (force_nonblock)
		if (force_nonblock) {
		/* only need file table for an actual valid fd */
		if (ctx->dfd == -1 \|\| ctx->dfd == AT_FDCWD)
		req->flags \|= REQ_F_NO_FILE_TABLE;
		return -EAGAIN;
		}

		if (vfs_stat_set_lookup_flags(&lookup_flags, ctx->how.flags))
		return -EINVAL;
		@@ -5429,7 +5437,7 @@ static int io_grab_files(struct io_kiocb *req)
		int ret = -EBADF;
		struct io_ring_ctx *ctx = req->ctx;

		if (req->work.files)
		if (req->work.files \|\| (req->flags & REQ_F_NO_FILE_TABLE))
		return 0;
		if (!ctx->ring_file)
		return -EBADF;