diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-22 08:30:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-22 08:30:09 -0800 |
| commit | dbab40bdb42c03ab12096d4aaf2dbef3fb55282c (patch) | |
| tree | 434c8bd1d70fe4d123f2d0e7cdd52b42e48e3e63 /fs | |
| parent | d96d875ef5dd372f533059a44f98e92de9cf0d42 (diff) | |
| parent | 1292e972fff2b2d81e139e0c2fe5f50249e78c58 (diff) | |
| download | linux-stable-dbab40bdb42c03ab12096d4aaf2dbef3fb55282c.tar.gz linux-stable-dbab40bdb42c03ab12096d4aaf2dbef3fb55282c.tar.bz2 linux-stable-dbab40bdb42c03ab12096d4aaf2dbef3fb55282c.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 187dd94fd6b1..5953d7f13690 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; |