projects/linux·commit dbab40bd

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

dbab40bd · Linus Torvalds <[email protected]> · 2020-01-22 08:30:09 -08:00

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
Commit
dbab40bdb42c03ab12096d4aaf2dbef3fb55282c
Parents
d96d875e · 1292e972

Merge commit. Changes below are compared with the first parent: d96d875e.

Changes

2 files changed · +5 −2

FileStatusAddDelContent
fs/io_uring.cmodified+3−1View file
include/uapi/linux/io_uring.hmodified+2−1View file

fs/io_uring.c

View file
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 187dd94..5953d7f 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -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

View file
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index a3300e1..55cfcb7 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -178,7 +178,8 @@ struct io_uring_params {
struct io_uring_files_update {
__u32 offset;
- __s32 *fds;
+ __u32 resv;
+ __aligned_u64 /* __s32 * */ fds;
};
#endif