Commit dbab40bd authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block

Pull io_uring fix from Jens Axboe:
 "This was supposed to have gone in last week, but due to a brain fart
  on my part, I forgot that we made this struct addition in the 5.5
  cycle. So here it is for 5.5, to prevent having a 32 vs 64-bit
  compatability issue with the files_update command"

* tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block:
  io_uring: fix compat for IORING_REGISTER_FILES_UPDATE
parents d96d875e 1292e972
...@@ -4463,13 +4463,15 @@ static int io_sqe_files_update(struct io_ring_ctx *ctx, void __user *arg, ...@@ -4463,13 +4463,15 @@ static int io_sqe_files_update(struct io_ring_ctx *ctx, void __user *arg,
return -EINVAL; return -EINVAL;
if (copy_from_user(&up, arg, sizeof(up))) if (copy_from_user(&up, arg, sizeof(up)))
return -EFAULT; return -EFAULT;
if (up.resv)
return -EINVAL;
if (check_add_overflow(up.offset, nr_args, &done)) if (check_add_overflow(up.offset, nr_args, &done))
return -EOVERFLOW; return -EOVERFLOW;
if (done > ctx->nr_user_files) if (done > ctx->nr_user_files)
return -EINVAL; return -EINVAL;
done = 0; done = 0;
fds = (__s32 __user *) up.fds; fds = u64_to_user_ptr(up.fds);
while (nr_args) { while (nr_args) {
struct fixed_file_table *table; struct fixed_file_table *table;
unsigned index; unsigned index;
......
...@@ -178,7 +178,8 @@ struct io_uring_params { ...@@ -178,7 +178,8 @@ struct io_uring_params {
struct io_uring_files_update { struct io_uring_files_update {
__u32 offset; __u32 offset;
__s32 *fds; __u32 resv;
__aligned_u64 /* __s32 * */ fds;
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment