Commit 3f5e2ba9 authored by Jens Axboe's avatar Jens Axboe Committed by Jialin Zhang
Browse files

io_uring: import 5.15-stable io_uring 

stable inclusion
from stable-v5.10.162
commit 788d0824269bef539fe31a785b1517882eafed93
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC
CVE: CVE-2023-0240

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.167&id=788d0824269bef539fe31a785b1517882eafed93



--------------------------------

No upstream commit exists.

This imports the io_uring codebase from 5.15.85, wholesale. Changes
from that code base:

- Drop IOCB_ALLOC_CACHE, we don't have that in 5.10.
- Drop MKDIRAT/SYMLINKAT/LINKAT. Would require further VFS backports,
  and we don't support these in 5.10 to begin with.
- sock_from_file() old style calling convention.
- Use compat_get_bitmap() only for CONFIG_COMPAT=y

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 8802b2dc

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ export MODORDER := $(extmod-prefix)modules.order 
export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps



ifeq ($(KBUILD_EXTMOD),)

core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/

core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ io_uring/



vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, \

		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \

fs/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ obj-$(CONFIG_TIMERFD) += timerfd.o 
obj-$(CONFIG_EVENTFD)		+= eventfd.o

obj-$(CONFIG_USERFAULTFD)	+= userfaultfd.o

obj-$(CONFIG_AIO)               += aio.o

obj-$(CONFIG_IO_URING)		+= io_uring.o

obj-$(CONFIG_IO_WQ)		+= io-wq.o

obj-$(CONFIG_FS_DAX)		+= dax.o

obj-$(CONFIG_FS_ENCRYPTION)	+= crypto/

obj-$(CONFIG_FS_VERITY)		+= verity/

include/linux/io_uring.h

+8 −38
Original line number Diff line number Diff line
@@ -5,50 +5,20 @@ 
#include <linux/sched.h>

#include <linux/xarray.h>



struct io_identity {

	struct files_struct		*files;

	struct mm_struct		*mm;

#ifdef CONFIG_BLK_CGROUP

	struct cgroup_subsys_state	*blkcg_css;

#endif

	const struct cred		*creds;

	struct nsproxy			*nsproxy;

	struct fs_struct		*fs;

	unsigned long			fsize;

#ifdef CONFIG_AUDIT

	kuid_t				loginuid;

	unsigned int			sessionid;

#endif

	refcount_t			count;

};



struct io_uring_task {

	/* submission side */

	struct xarray		xa;

	struct wait_queue_head	wait;

	struct file		*last;

	struct percpu_counter	inflight;

	struct io_identity	__identity;

	struct io_identity	*identity;

	atomic_t		in_idle;

	bool			sqpoll;

};



#if defined(CONFIG_IO_URING)

struct sock *io_uring_get_socket(struct file *file);

void __io_uring_task_cancel(void);

void __io_uring_files_cancel(struct files_struct *files);

void __io_uring_cancel(bool cancel_all);

void __io_uring_free(struct task_struct *tsk);



static inline void io_uring_task_cancel(void)

static inline void io_uring_files_cancel(void)

{

	if (current->io_uring && !xa_empty(&current->io_uring->xa))

		__io_uring_task_cancel();

	if (current->io_uring)

		__io_uring_cancel(false);

}

static inline void io_uring_files_cancel(struct files_struct *files)

static inline void io_uring_task_cancel(void)

{

	if (current->io_uring && !xa_empty(&current->io_uring->xa))

		__io_uring_files_cancel(files);

	if (current->io_uring)

		__io_uring_cancel(true);

}

static inline void io_uring_free(struct task_struct *tsk)

{
@@ -63,7 +33,7 @@ static inline struct sock *io_uring_get_socket(struct file *file) 
static inline void io_uring_task_cancel(void)

{

}

static inline void io_uring_files_cancel(struct files_struct *files)

static inline void io_uring_files_cancel(void)

{

}

static inline void io_uring_free(struct task_struct *tsk)

include/linux/sched.h

+3 −0
Original line number Diff line number Diff line
@@ -925,6 +925,9 @@ struct task_struct { 
	/* CLONE_CHILD_CLEARTID: */

	int __user			*clear_child_tid;



	/* PF_IO_WORKER */

	void				*pf_io_worker;



	u64				utime;

	u64				stime;

#ifdef CONFIG_ARCH_HAS_SCALED_CPUTIME

include/linux/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ asmlinkage long sys_io_uring_setup(u32 entries, 
				struct io_uring_params __user *p);

asmlinkage long sys_io_uring_enter(unsigned int fd, u32 to_submit,

				u32 min_complete, u32 flags,

				const sigset_t __user *sig, size_t sigsz);

				const void __user *argp, size_t argsz);

asmlinkage long sys_io_uring_register(unsigned int fd, unsigned int op,

				void __user *arg, unsigned int nr_args);