Inherited restrictions and BPF filtering
Subsystems (6)
Jens Axboe
maintainerRFC PATCH v4 1/1 Inherited restrictions and BPF filtering
Hi,
Followup to v3 here:
https://lore.kernel.org/io-uring/[email protected]/
which has all the gory details. The main new thing in v4 is proper support for stacking of BPF filters, when a task goes through fork. These are referenced, and COW'ed if new filters are attempted installed in the referenced filter.
Performance and functionality is otherwise the same. See the changelog for more details.
Comments welcome! Kernel branch can be found here:
https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git/log/?h=io_uring-bpf-restrictions
and sits on top of for-7.0/io_uring.
Changes since v3:
- Move fork.c logic to an io_uring helper, io_uring_fork(), rather than open code it.
- Sort out the filter and filter table references, and drop the patch that made io_restriction dynamically allocated.
- Drop IORING_REGISTER_RESTRICTIONS_TASK, IORING_REGISTER_RESTRICTIONS can just get reused with fd == -1 like other "blind" reg opcodes.
- Split IORING_OP_SOCKET filter support patch out as a separate patch
- Fix a few style issues
- Do proper cloning of registered BPF filters, if a task is forked. These are done COW style, where initially a new task will just inherit the existing filter with a reference to it. If new filters are added in the new task, then the existing table is COW'ed.
- Drop ctx->bpf_restricted, just check for the presence of the filter.
- Drop various alloc helpers, not needed with other cleanups.
- Add and improve a bunch of comments.
include/linux/bpf.h | 1 + include/linux/bpf_types.h | 4 + include/linux/io_uring.h | 14 +- include/linux/io_uring_types.h | 16 ++ include/linux/sched.h | 1 + include/uapi/linux/bpf.h | 1 + include/uapi/linux/io_uring.h | 52 +++++ io_uring/Makefile | 1 + io_uring/bpf_filter.c | 372 +++++++++++++++++++++++++++++++++ io_uring/bpf_filter.h | 46 ++++ io_uring/io_uring.c | 27 +++ io_uring/io_uring.h | 1 + io_uring/net.c | 9 + io_uring/net.h | 5 + io_uring/register.c | 73 +++++++ io_uring/tctx.c | 40 +++- kernel/bpf/syscall.c | 9 + kernel/fork.c | 5 + 18 files changed, 667 insertions(+), 10 deletions(-)
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/5 io_uring: add support for BPF filtering for opcode restrictions
This adds support for loading BPF programs with io_uring, which can restrict the opcodes executed. Unlike IORING_REGISTER_RESTRICTIONS, using BPF programs allow fine grained control over both the opcode in question, as well as other data associated with the request. This initial patch just supports whatever is in the io_kiocb for filtering, but shortly opcode specific support will be added.
--- include/linux/bpf.h | 1 + include/linux/bpf_types.h | 4 + include/linux/io_uring_types.h | 14 ++ include/uapi/linux/bpf.h | 1 + include/uapi/linux/io_uring.h | 38 +++++ io_uring/Makefile | 1 + io_uring/bpf_filter.c | 285 +++++++++++++++++++++++++++++++++ io_uring/bpf_filter.h | 40 +++++ io_uring/io_uring.c | 8 + io_uring/register.c | 8 + kernel/bpf/syscall.c | 9 ++ 11 files changed, 409 insertions(+) create mode 100644 io_uring/bpf_filter.c create mode 100644 io_uring/bpf_filter.h
include/linux/bpf.h +1 -0
@@ -31,6 +31,7 @@#include <linux/static_call.h> #include <linux/memcontrol.h> #include <linux/cfi.h> +#include <linux/io_uring_types.h> #include <asm/rqspinlock.h> struct bpf_verifier_env ;
include/linux/bpf_types.h +4 -0
@@ -83,6 +83,10 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_SYSCALL, bpf_syscall,BPF_PROG_TYPE (BPF_PROG_TYPE_NETFILTER , netfilter, struct bpf_nf_ctx, struct bpf_nf_ctx)#endif +#ifdef CONFIG_IO_URING +BPF_PROG_TYPE (BPF_PROG_TYPE_IO_URING , io_uring_filter, + struct io_uring_bpf_ctx, struct io_uring_bpf_ctx) +#endif BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY, array_map_ops)BPF_MAP_TYPE (BPF_MAP_TYPE_PERCPU_ARRAY , percpu_array_map_ops)
include/linux/io_uring_types.h +14 -0
@@ -219,9 +219,23 @@ struct io_rings {struct io_uring_cqe cqes[]____cacheline_aligned_in_smp ; }; +#ifdef CONFIG_BPF +extern const struct bpf_prog_ops io_uring_filter_prog_ops; +extern const struct bpf_verifier_ops io_uring_filter_verifier_ops; +#endif + +struct io_bpf_filter ; +struct io_bpf_filters { +refcount_t refs;/* ref for ->bpf_filters */ +spinlock_t lock;/* protects ->bpf_filters modifications */ +struct io_bpf_filter __rcu **filters; +struct rcu_head rcu_head; +}; +struct io_restriction { DECLARE_BITMAP(register_op, IORING_REGISTER_LAST); DECLARE_BITMAP(sqe_op, IORING_OP_LAST); +struct io_bpf_filters *bpf_filters;u8 sqe_flags_allowed;u8 sqe_flags_required;/* IORING_OP_* restrictions exist */
include/uapi/linux/bpf.h +1 -0
@@ -1072,6 +1072,7 @@ enum bpf_prog_type {BPF_PROG_TYPE_SK_LOOKUP ,BPF_PROG_TYPE_SYSCALL ,/* a program that can execute syscalls */ BPF_PROG_TYPE_NETFILTER , +BPF_PROG_TYPE_IO_URING , __MAX_BPF_PROG_TYPE };
include/uapi/linux/io_uring.h +38 -0
@@ -700,6 +700,9 @@ enum io_uring_register_op {/* auxiliary zcrx configuration, see enum zcrx_ctrl_op */ IORING_REGISTER_ZCRX_CTRL =36 , +/* register bpf filtering programs */ +IORING_REGISTER_BPF_FILTER =37 , +/* this goes last */ IORING_REGISTER_LAST,
@@ -1113,6 +1116,41 @@ struct zcrx_ctrl { }; }; +struct io_uring_bpf_ctx { +__u8 opcode; +__u8 sqe_flags; +__u8 pad[6 ]; +__u64 user_data; +__u64 resv[6 ]; +}; + +enum { +/* +* If set, any currently unset opcode will have a deny filter attached +*/ +IO_URING_BPF_FILTER_DENY_REST =1 , +}; + +struct io_uring_bpf_filter { +__u32 opcode;/* io_uring opcode to filter */ +__u32 flags; +__s32 prog_fd;/* BPF program fd */ +__u32 reserved[3 ]; +}; + +enum { +IO_URING_BPF_CMD_FILTER =1 , +}; + +struct io_uring_bpf { +__u16 cmd_type;/* IO_URING_BPF_* values */ +__u16 cmd_flags;/* none so far */ +__u32 resv; +union { +struct io_uring_bpf_filter filter; + }; +}; + #ifdef __cplusplus }#endif
io_uring/Makefile +1 -0
@@ -22,3 +22,4 @@ obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o obj-$(CONFIG_NET) += net.o cmd_net.o obj-$(CONFIG_PROC_FS) += fdinfo.o obj-$(CONFIG_IO_URING_MOCK_FILE) += mock_file.o +obj-$(CONFIG_BPF) += bpf_filter.o
io_uring/bpf_filter.c new file +285 -0
285 lines not on this page · raw message
io_uring/bpf_filter.h new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef IO_URING_BPF_FILTER_H +#define IO_URING_BPF_FILTER_H + +#ifdef CONFIG_BPF + +int __io_uring_run_bpf_filters (struct io_restriction *res,struct io_kiocb *req); + +int io_register_bpf_filter (struct io_restriction *res, +struct io_uring_bpf __user *arg); + +void io_put_bpf_filters (struct io_restriction *res); + +static inline int io_uring_run_bpf_filters (struct io_restriction *res, +struct io_kiocb *req) +{ +if (res->bpf_filters) +return __io_uring_run_bpf_filters (res, req); + +return 0 ; +} + +#else + +static inline int io_register_bpf_filter (struct io_restriction *res, +struct io_uring_bpf __user *arg) +{ +return -EINVAL ; +} +static inline int io_uring_run_bpf_filters (struct io_restriction *res, +struct io_kiocb *req) +{ +return 0 ; +} +static inline void io_put_bpf_filters (struct io_restriction *res) +{ +} +#endif /* CONFIG_IO_URING */ + +#endif
io_uring/io_uring.c +8 -0
@@ -93,6 +93,7 @@#include "rw.h" #include "alloc_cache.h" #include "eventfd.h" +#include "bpf_filter.h" #define SQE_COMMON_FLAGS (IOSQE_FIXED_FILE | IOSQE_IO_LINK | \ IOSQE_IO_HARDLINK | IOSQE_ASYNC)
@@ -2261,6 +2262,12 @@ static inline int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,if (unlikely (ret))return io_submit_fail_init (sqe, req, ret); +if (unlikely (ctx->restrictions.bpf_filters)) { + ret =io_uring_run_bpf_filters (&ctx->restrictions, req); +if (ret) +return io_submit_fail_init (sqe, req, ret); + } +trace_io_uring_submit_req (req);/*
@@ -2850,6 +2857,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)percpu_ref_exit (&ctx->refs);free_uid (ctx->user);io_req_caches_free (ctx); +io_put_bpf_filters (&ctx->restrictions);WARN_ON_ONCE (ctx->nr_req_allocated);
io_uring/register.c +8 -0
@@ -33,6 +33,7 @@#include "memmap.h" #include "zcrx.h" #include "query.h" +#include "bpf_filter.h" #define IORING_MAX_RESTRICTIONS (IORING_RESTRICTION_LAST + \ IORING_REGISTER_LAST + IORING_OP_LAST)
@@ -830,6 +831,13 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,case IORING_REGISTER_ZCRX_CTRL : ret =io_zcrx_ctrl (ctx, arg, nr_args);break ; +case IORING_REGISTER_BPF_FILTER : + ret = -EINVAL ; + +if (nr_args !=1 ) +break ; + ret =io_register_bpf_filter (&ctx->restrictions, arg); +break ;default : ret = -EINVAL ;break ;
kernel/bpf/syscall.c +9 -0
@@ -2752,6 +2752,10 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type,if (expected_attach_type ==BPF_NETFILTER )return 0 ;return -EINVAL ; +case BPF_PROG_TYPE_IO_URING : +if (expected_attach_type) +return -EINVAL ; +return 0 ;case BPF_PROG_TYPE_SYSCALL :case BPF_PROG_TYPE_EXT :if (expected_attach_type)
@@ -2934,6 +2938,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) }if (type !=BPF_PROG_TYPE_SOCKET_FILTER && type !=BPF_PROG_TYPE_CGROUP_SKB && + type !=BPF_PROG_TYPE_IO_URING && !bpf_cap) goto put_token;
@@ -4403,6 +4408,10 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,if (attach_type !=BPF_NETFILTER )return -EINVAL ;return 0 ; +case BPF_PROG_TYPE_IO_URING : +if (attach_type !=0 ) +return -EINVAL ; +return 0 ;case BPF_PROG_TYPE_PERF_EVENT :case BPF_PROG_TYPE_TRACEPOINT :if (attach_type !=BPF_PERF_EVENT )
Signature · 1 line
2.51.0
Jens Axboe
maintainerPATCH 2/5 io_uring/net: allow filtering on IORING_OP_SOCKET data
In reply to Jens AxboeExample population method for the BPF based opcode filtering. This exposes the socket family, type, and protocol to a registered BPF filter. This in turn enables the filter to make decisions based on what was passed in to the IORING_OP_SOCKET request type.
--- include/uapi/linux/io_uring.h | 9 ++++++++- io_uring/bpf_filter.c | 10 ++++++++++ io_uring/net.c | 9 +++++++++ io_uring/net.h | 5 +++++ 4 files changed, 32 insertions(+), 1 deletion(-)
include/uapi/linux/io_uring.h +8 -1
@@ -1121,7 +1121,14 @@ struct io_uring_bpf_ctx {__u8 sqe_flags;__u8 pad[6 ];__u64 user_data; -__u64 resv[6 ]; +union { +__u64 resv[6 ]; +struct { +__u32 family; +__u32 type; +__u32 protocol; + } socket; + }; };enum {
io_uring/bpf_filter.c +10 -0
@@ -78,6 +78,16 @@ static void io_uring_populate_bpf_ctx(struct io_uring_bpf_ctx *bctx, bctx->opcode = req->opcode; bctx->sqe_flags = (__force int ) req->flags &SQE_VALID_FLAGS ; bctx->user_data = req->cqe.user_data; + +/* +* Opcodes can provide a handler fo populating more data into bctx, +* for filters to use. +*/ +switch (req->opcode) { +case IORING_OP_SOCKET : +io_socket_bpf_populate (bctx, req); +break ; + } }/*
io_uring/net.c +9 -0
@@ -1699,6 +1699,15 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags)return IOU_COMPLETE ; } +void io_socket_bpf_populate (struct io_uring_bpf_ctx *bctx,struct io_kiocb *req) +{ + struct io_socket *sock = io_kiocb_to_cmd(req, struct io_socket); + + bctx->socket.family = sock->domain; + bctx->socket.type = sock->type; + bctx->socket.protocol = sock->protocol; +} +int io_socket_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { struct io_socket *sock = io_kiocb_to_cmd(req, struct io_socket);
io_uring/net.h +5 -0
@@ -44,6 +44,7 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags);int io_socket_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_socket (struct io_kiocb *req,unsigned int issue_flags); +void io_socket_bpf_populate (struct io_uring_bpf_ctx *bctx,struct io_kiocb *req);int io_connect_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_connect (struct io_kiocb *req,unsigned int issue_flags);
@@ -64,4 +65,8 @@ void io_netmsg_cache_free(const void *entry);static inline void io_netmsg_cache_free (const void *entry) { } +static inline void io_socket_bpf_populate (struct io_uring_bpf_ctx *bctx, +struct io_kiocb *req) +{ +}#endif
Signature · 1 line
2.51.0
Jens Axboe
maintainerPATCH 3/5 io_uring/bpf_filter: add ref counts to struct io_bpf_filter
In reply to Jens AxboeIn preparation for allowing inheritance of BPF filters and filter tables, add a reference count to the filter. This allows multiple tables to safely include the same filter.
--- io_uring/bpf_filter.c | 7 +++++++ 1 file changed, 7 insertions(+)
io_uring/bpf_filter.c +7 -0
@@ -14,6 +14,7 @@#include "net.h" struct io_bpf_filter { +refcount_t refs;struct bpf_prog *prog;struct io_bpf_filter *next; };
@@ -165,6 +166,11 @@ static void io_free_bpf_filters(struct rcu_head *head)*/ if (f == &dummy_filter)break ; + +/* Someone still holds a ref, stop iterating. */ +if (!refcount_dec_and_test (&f->refs)) +break ; +if (f->prog)bpf_prog_put (f->prog);kfree (f);
@@ -254,6 +260,7 @@ int io_register_bpf_filter(struct io_restriction *res, ret = -ENOMEM ; goto err; } +refcount_set (&filter->refs,1 ); filter->prog = prog; res->bpf_filters = filters;
Signature · 1 line
2.51.0
Jens Axboe
maintainerPATCH 4/5 io_uring: add task fork hook
In reply to Jens AxboeCalled when copy_process() is called to copy state to a new child. Right now this is just a stub, but will be used shortly to properly handle fork'ing of task based io_uring restrictions.
--- include/linux/io_uring.h | 14 +++++++++++++- include/linux/sched.h | 1 + io_uring/tctx.c | 5 +++++ kernel/fork.c | 5 +++++ 4 files changed, 24 insertions(+), 1 deletion(-)
include/linux/io_uring.h +13 -1
@@ -12,6 +12,7 @@ void __io_uring_free(struct task_struct *tsk);void io_uring_unreg_ringfd (void );const char *io_uring_get_opcode (u8 opcode);bool io_is_uring_fops (struct file *file); +int __io_uring_fork (struct task_struct *tsk);static inline void io_uring_files_cancel (void ) {
@@ -25,9 +26,16 @@ static inline void io_uring_task_cancel(void) }static inline void io_uring_free (struct task_struct *tsk) { -if (tsk->io_uring) +if (tsk->io_uring || tsk->io_uring_restrict)__io_uring_free (tsk); } +static inline int io_uring_fork (struct task_struct *tsk) +{ +if (tsk->io_uring_restrict) +return __io_uring_fork (tsk); + +return 0 ; +}#else static inline void io_uring_task_cancel (void ) {
@@ -46,6 +54,10 @@ static inline bool io_is_uring_fops(struct file *file) {return false; } +static inline int io_uring_fork (struct task_struct *tsk) +{ +return 0 ; +}#endif #endif
include/linux/sched.h +1 -0
@@ -1190,6 +1190,7 @@ struct task_struct {#ifdef CONFIG_IO_URING struct io_uring_task *io_uring; +struct io_restriction *io_uring_restrict;#endif /* Namespaces: */
io_uring/tctx.c +5 -0
@@ -351,3 +351,8 @@ int io_ringfd_unregister(struct io_ring_ctx *ctx, void __user *__arg,return i ? i : ret; } + +int __io_uring_fork (struct task_struct *tsk) +{ +return 0 ; +}
kernel/fork.c +5 -0
@@ -97,6 +97,7 @@#include <linux/kasan.h> #include <linux/scs.h> #include <linux/io_uring.h> +#include <linux/io_uring_types.h> #include <linux/bpf.h> #include <linux/stackprotector.h> #include <linux/user_events.h>
@@ -2129,6 +2130,9 @@ __latent_entropy struct task_struct *copy_process(#ifdef CONFIG_IO_URING p->io_uring =NULL ; + retval =io_uring_fork (p); +if (unlikely (retval)) + goto bad_fork_cleanup_delayacct;#endif p->default_timer_slack_ns = current->timer_slack_ns;
@@ -2525,6 +2529,7 @@ __latent_entropy struct task_struct *copy_process(mpol_put (p->mempolicy);#endif bad_fork_cleanup_delayacct: +io_uring_free (p);delayacct_tsk_free (p); bad_fork_cleanup_count:dec_rlimit_ucounts (task_ucounts (p),UCOUNT_RLIMIT_NPROC ,1 );
Signature · 1 line
2.51.0
Jens Axboe
maintainerPATCH 5/5 io_uring: allow registration of per-task restrictions
In reply to Jens AxboeCurrently io_uring supports restricting operations on a per-ring basis. To use those, the ring must be setup in a disabled state by setting IORING_SETUP_R_DISABLED. Then restrictions can be set for the ring, and the ring can then be enabled.
This commit adds support for IORING_REGISTER_RESTRICTIONS with ring_fd == -1, like the other "blind" register opcodes which work on the task rather than a specific ring. This allows registration of the same kind of restrictions as can been done on a specific ring, but with the task itself. Once done, any ring created will inherit these restrictions.
If a restriction filter is registered with a task, then it's inherited on fork for its children. Children may only further restrict operations, not extend them.
Inheriting restrictions include both the classic IORING_REGISTER_RESTRICTIONS based restrictions, as well as the BPF filters that have been registered with the task via IORING_REGISTER_BPF_FILTER.
--- include/linux/io_uring_types.h | 2 + include/uapi/linux/io_uring.h | 7 ++++ io_uring/bpf_filter.c | 70 ++++++++++++++++++++++++++++++++++ io_uring/bpf_filter.h | 6 +++ io_uring/io_uring.c | 19 +++++++++ io_uring/io_uring.h | 1 + io_uring/register.c | 65 +++++++++++++++++++++++++++++++ io_uring/tctx.c | 35 ++++++++++++----- 8 files changed, 196 insertions(+), 9 deletions(-)
include/linux/io_uring_types.h +2 -0
@@ -236,6 +236,8 @@ struct io_restriction {DECLARE_BITMAP (register_op,IORING_REGISTER_LAST );DECLARE_BITMAP (sqe_op,IORING_OP_LAST );struct io_bpf_filters *bpf_filters; +/* ->bpf_filters needs COW on modification */ +bool bpf_filters_cow;u8 sqe_flags_allowed;u8 sqe_flags_required;/* IORING_OP_* restrictions exist */
include/uapi/linux/io_uring.h +7 -0
@@ -808,6 +808,13 @@ struct io_uring_restriction {__u32 resv2[3 ]; }; +struct io_uring_task_restriction { +__u16 flags; +__u16 nr_res; +__u32 resv[3 ]; + __DECLARE_FLEX_ARRAY(struct io_uring_restriction, restrictions); +}; +struct io_uring_clock_register {__u32 clockid;__u32 __resv[3 ];
io_uring/bpf_filter.c +70 -0
82 lines not on this page · raw message
io_uring/bpf_filter.h +6 -0
@@ -11,6 +11,8 @@ int io_register_bpf_filter(struct io_restriction *res,void io_put_bpf_filters (struct io_restriction *res); +void io_bpf_filter_clone (struct io_restriction *dst,struct io_restriction *src); +static inline int io_uring_run_bpf_filters (struct io_restriction *res,struct io_kiocb *req) {
@@ -35,6 +37,10 @@ static inline int io_uring_run_bpf_filters(struct io_restriction *res,static inline void io_put_bpf_filters (struct io_restriction *res) { } +static inline void io_bpf_filter_clone (struct io_restriction *dst, +struct io_restriction *src) +{ +}#endif /* CONFIG_IO_URING */ #endif
io_uring/io_uring.c +19 -0
@@ -3562,6 +3562,18 @@ int io_prepare_config(struct io_ctx_config *config)return 0 ; } +void io_restriction_clone (struct io_restriction *dst,struct io_restriction *src) +{ +memcpy (&dst->register_op, &src->register_op,sizeof (dst->register_op)); +memcpy (&dst->sqe_op, &src->sqe_op,sizeof (dst->sqe_op)); + dst->sqe_flags_allowed = src->sqe_flags_allowed; + dst->sqe_flags_required = src->sqe_flags_required; + dst->op_registered = src->op_registered; + dst->reg_registered = src->reg_registered; + +io_bpf_filter_clone (dst, src); +} +static __cold int io_uring_create (struct io_ctx_config *config) {struct io_uring_params *p = &config->p;
@@ -3622,6 +3634,13 @@ static __cold int io_uring_create(struct io_ctx_config *config)else ctx->notify_method =TWA_SIGNAL ; +/* +* If the current task has restrictions enabled, then copy them to +* our newly created ring and mark it as registered. +*/ +if (current->io_uring_restrict) +io_restriction_clone (&ctx->restrictions, current->io_uring_restrict); +/* * This is just grabbed for accounting purposes. When a process exits, * the mm is exited and dropped before the files, hence we need to hang
io_uring/io_uring.h +1 -0
@@ -195,6 +195,7 @@ void io_task_refs_refill(struct io_uring_task *tctx);bool __io_alloc_req_refill (struct io_ring_ctx *ctx);void io_activate_pollwq (struct io_ring_ctx *ctx); +void io_restriction_clone (struct io_restriction *dst,struct io_restriction *src);static inline void io_lockdep_assert_cq_locked (struct io_ring_ctx *ctx) {
io_uring/register.c +65 -0
77 lines not on this page · raw message
io_uring/tctx.c +26 -9
@@ -11,6 +11,8 @@#include "io_uring.h" #include "tctx.h" +#include "register.h" +#include "bpf_filter.h" static struct io_wq *io_init_wq_offload (struct io_ring_ctx *ctx,struct task_struct *task)
@@ -54,16 +56,23 @@ void __io_uring_free(struct task_struct *tsk)* node is stored in the xarray. Until that gets sorted out, attempt * an iteration here and warn if any entries are found. */ -xa_for_each (&tctx->xa, index, node) { -WARN_ON_ONCE (1 ); -break ; - } -WARN_ON_ONCE (tctx->io_wq); -WARN_ON_ONCE (tctx->cached_refs); +if (tctx) { +xa_for_each (&tctx->xa, index, node) { +WARN_ON_ONCE (1 ); +break ; + } +WARN_ON_ONCE (tctx->io_wq); +WARN_ON_ONCE (tctx->cached_refs); -percpu_counter_destroy (&tctx->inflight); -kfree (tctx); - tsk->io_uring =NULL ; +percpu_counter_destroy (&tctx->inflight); +kfree (tctx); + tsk->io_uring =NULL ; + } +if (tsk->io_uring_restrict) { +io_put_bpf_filters (tsk->io_uring_restrict); +kfree (tsk->io_uring_restrict); + tsk->io_uring_restrict =NULL ; + } } __cold int io_uring_alloc_task_context(struct task_struct *task,
@@ -354,5 +363,13 @@ int io_ringfd_unregister(struct io_ring_ctx *ctx, void __user *__arg,int __io_uring_fork (struct task_struct *tsk) { +struct io_restriction *res, *src = tsk->io_uring_restrict; + + res =kzalloc (sizeof (*res),GFP_KERNEL_ACCOUNT ); +if (!res) +return -ENOMEM ; + + tsk->io_uring_restrict = res; +io_restriction_clone (res, src);return 0 ; }
Signature · 1 line
2.51.0