Commit 4d927483 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'io_uring-5.5' into for-5.6/io_uring-vfs 

Pull in compatability fix for the files_update command.

* io_uring-5.5:
  io_uring: fix compat for IORING_REGISTER_FILES_UPDATE
parents fa7773de 1292e972

fs/io_uring.c

+3 −1
Original line number Diff line number Diff line
@@ -4463,13 +4463,15 @@ static int io_sqe_files_update(struct io_ring_ctx *ctx, void __user *arg, 
		return -EINVAL;

	if (copy_from_user(&up, arg, sizeof(up)))

		return -EFAULT;

	if (up.resv)

		return -EINVAL;

	if (check_add_overflow(up.offset, nr_args, &done))

		return -EOVERFLOW;

	if (done > ctx->nr_user_files)

		return -EINVAL;



	done = 0;

	fds = (__s32 __user *) up.fds;

	fds = u64_to_user_ptr(up.fds);

	while (nr_args) {

		struct fixed_file_table *table;

		unsigned index;

include/uapi/linux/io_uring.h

+2 −1
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ struct io_uring_params { 


struct io_uring_files_update {

	__u32 offset;

	__s32 *fds;

	__u32 resv;

	__aligned_u64 /* __s32 * */ fds;

};



#endif