diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2022-07-08 11:25:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2022-07-08 11:25:01 -0700 |
| commit | 29837019d5ebb80a5f180af3107a0645c731a770 (patch) | |
| tree | e4038ffe322ab1ad81ad0404dd1ae15fd4c8e6c9 /fs | |
| parent | Merge tag 'for-5.19/fbdev-3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | io_uring: explicit sqe padding for ioctl commands (diff) | |
| download | linux-29837019d5ebb80a5f180af3107a0645c731a770.tar.gz linux-29837019d5ebb80a5f180af3107a0645c731a770.tar.bz2 linux-29837019d5ebb80a5f180af3107a0645c731a770.zip | |
Merge tag 'io_uring-5.19-2022-07-08' of git://git.kernel.dk/linux-block
Pull io_uring tweak from Jens Axboe:
"Just a minor tweak to an addition made in this release cycle: padding
a 32-bit value that's in a 64-bit union to avoid any potential
funkiness from that"
* tag 'io_uring-5.19-2022-07-08' of git://git.kernel.dk/linux-block:
io_uring: explicit sqe padding for ioctl commands
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 0d491ad15b66..cddc0e8490af 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5066,7 +5066,7 @@ static int io_uring_cmd_prep(struct io_kiocb *req, { struct io_uring_cmd *ioucmd = &req->uring_cmd; - if (sqe->rw_flags) + if (sqe->rw_flags || sqe->__pad1) return -EINVAL; ioucmd->cmd = sqe->cmd; ioucmd->cmd_op = READ_ONCE(sqe->cmd_op); |