diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-01-20 17:01:17 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-20 17:01:17 -0700 |
| commit | 4d927483732f759769613388813ff5dbb29902a7 (patch) | |
| tree | 46397f35be6b442f530450f292d7ee8593f845bf | |
| parent | fa7773deb344fbfe0405d1720d4a0cdd5970369e (diff) | |
| parent | 1292e972fff2b2d81e139e0c2fe5f50249e78c58 (diff) | |
| download | linux-4d927483732f759769613388813ff5dbb29902a7.tar.gz linux-4d927483732f759769613388813ff5dbb29902a7.tar.bz2 linux-4d927483732f759769613388813ff5dbb29902a7.zip | |
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
| -rw-r--r-- | fs/io_uring.c | 4 | ||||
| -rw-r--r-- | include/uapi/linux/io_uring.h | 3 |
2 files changed, 5 insertions, 2 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; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index a3300e1b9a01..55cfcb71606d 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 |