tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 29837019 086ff846

+5 -2
+1 -1
fs/io_uring.c
··· 5066 5066 { 5067 5067 struct io_uring_cmd *ioucmd = &req->uring_cmd; 5068 5068 5069 - if (sqe->rw_flags) 5069 + if (sqe->rw_flags || sqe->__pad1) 5070 5070 return -EINVAL; 5071 5071 ioucmd->cmd = sqe->cmd; 5072 5072 ioucmd->cmd_op = READ_ONCE(sqe->cmd_op);
+4 -1
include/uapi/linux/io_uring.h
··· 22 22 union { 23 23 __u64 off; /* offset into file */ 24 24 __u64 addr2; 25 - __u32 cmd_op; 25 + struct { 26 + __u32 cmd_op; 27 + __u32 __pad1; 28 + }; 26 29 }; 27 30 union { 28 31 __u64 addr; /* pointer to buffer or iovecs */