Commit 29837019 authored Jul 08, 2022 by Linus Torvalds

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

parents 086ff846 bdb2c48e

fs/io_uring.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

include/uapi/linux/io_uring.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,10 @@ struct io_uring_sqe {
		union {
		__u64 off; /* offset into file */
		__u64 addr2;
		struct {
		__u32 cmd_op;
		__u32 __pad1;
		};
		};
		union {
		__u64 addr; /* pointer to buffer or iovecs */