Commit 1da8cf96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.0-2022-08-13' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:

 - Regression fix for this merge window, fixing a wrong order of
   arguments for io_req_set_res() for passthru (Dylan)

 - Fix for the audit code leaking context memory (Peilin)

 - Ensure that provided buffers are memcg accounted (Pavel)

 - Correctly handle short zero-copy sends (Pavel)

 - Sparse warning fixes for the recvmsg multishot command (Dylan)

 - Error handling fix for passthru (Anuj)

 - Remove randomization of struct kiocb fields, to avoid it growing in
   size if re-arranged in such a fashion that it grows more holes or
   padding (Keith, Linus)

 - Small series improving type safety of the sqe fields (Stefan)

* tag 'io_uring-6.0-2022-08-13' of git://git.kernel.dk/linux-block:
  io_uring: add missing BUILD_BUG_ON() checks for new io_uring_sqe fields
  io_uring: make io_kiocb_to_cmd() typesafe
  fs: don't randomize struct kiocb fields
  io_uring: consistently make use of io_notif_to_data()
  io_uring: fix error handling for io_uring_cmd
  io_uring: fix io_recvmsg_prep_multishot sparse warnings
  io_uring/net: send retry for zerocopy
  io_uring: mem-account pbuf buckets
  audit, io_uring, io-wq: Fix memory leak in io_sq_thread() and io_wqe_worker()
  io_uring: pass correct parameters to io_req_set_res
parents 69dac8e4 9c71d39a

include/linux/audit.h

+0 −5
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ static inline int audit_signal_info(int sig, struct task_struct *t) 
/* These are defined in auditsc.c */

				/* Public API */

extern int  audit_alloc(struct task_struct *task);

extern int  audit_alloc_kernel(struct task_struct *task);

extern void __audit_free(struct task_struct *task);

extern void __audit_uring_entry(u8 op);

extern void __audit_uring_exit(int success, long code);
@@ -578,10 +577,6 @@ static inline int audit_alloc(struct task_struct *task) 
{

	return 0;

}

static inline int audit_alloc_kernel(struct task_struct *task)

{

	return 0;

}

static inline void audit_free(struct task_struct *task)

{ }

static inline void audit_uring_entry(u8 op)

include/linux/fs.h

+0 −5
Original line number Diff line number Diff line
@@ -340,17 +340,12 @@ enum rw_hint { 


struct kiocb {

	struct file		*ki_filp;



	/* The 'ki_filp' pointer is shared in a union for aio */

	randomized_struct_fields_start



	loff_t			ki_pos;

	void (*ki_complete)(struct kiocb *iocb, long ret);

	void			*private;

	int			ki_flags;

	u16			ki_ioprio; /* See linux/ioprio.h */

	struct wait_page_queue	*ki_waitq; /* for async buffered IO */

	randomized_struct_fields_end

};



static inline bool is_sync_kiocb(struct kiocb *kiocb)

include/linux/io_uring_types.h

+8 −1
Original line number Diff line number Diff line
@@ -491,7 +491,14 @@ struct io_cmd_data { 
	__u8			data[56];

};



#define io_kiocb_to_cmd(req)	((void *) &(req)->cmd)

static inline void io_kiocb_cmd_sz_check(size_t cmd_sz)

{

	BUILD_BUG_ON(cmd_sz > sizeof(struct io_cmd_data));

}

#define io_kiocb_to_cmd(req, cmd_type) ( \

	io_kiocb_cmd_sz_check(sizeof(cmd_type)) , \

	((cmd_type *)&(req)->cmd) \

)

#define cmd_to_io_kiocb(ptr)	((struct io_kiocb *) ptr)



struct io_kiocb {

io_uring/advise.c

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct io_madvise { 
int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)

	struct io_madvise *ma = io_kiocb_to_cmd(req);

	struct io_madvise *ma = io_kiocb_to_cmd(req, struct io_madvise);



	if (sqe->buf_index || sqe->off || sqe->splice_fd_in)

		return -EINVAL;
@@ -48,7 +48,7 @@ int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
int io_madvise(struct io_kiocb *req, unsigned int issue_flags)

{

#if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)

	struct io_madvise *ma = io_kiocb_to_cmd(req);

	struct io_madvise *ma = io_kiocb_to_cmd(req, struct io_madvise);

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK)
@@ -64,7 +64,7 @@ int io_madvise(struct io_kiocb *req, unsigned int issue_flags) 


int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_fadvise *fa = io_kiocb_to_cmd(req);

	struct io_fadvise *fa = io_kiocb_to_cmd(req, struct io_fadvise);



	if (sqe->buf_index || sqe->addr || sqe->splice_fd_in)

		return -EINVAL;
@@ -77,7 +77,7 @@ int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


int io_fadvise(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_fadvise *fa = io_kiocb_to_cmd(req);

	struct io_fadvise *fa = io_kiocb_to_cmd(req, struct io_fadvise);

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK) {

io_uring/cancel.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ int io_try_cancel(struct io_uring_task *tctx, struct io_cancel_data *cd, 


int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_cancel *cancel = io_kiocb_to_cmd(req);

	struct io_cancel *cancel = io_kiocb_to_cmd(req, struct io_cancel);



	if (unlikely(req->flags & REQ_F_BUFFER_SELECT))

		return -EINVAL;
@@ -164,7 +164,7 @@ static int __io_async_cancel(struct io_cancel_data *cd, 


int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_cancel *cancel = io_kiocb_to_cmd(req);

	struct io_cancel *cancel = io_kiocb_to_cmd(req, struct io_cancel);

	struct io_cancel_data cd = {

		.ctx	= req->ctx,

		.data	= cancel->addr,