Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafc787e authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

arm: bpf_jit: can call module_free() from any context 



Follow-up on module_free()/vfree() that takes care of the rest, so no
longer this workaround with work_struct needed.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Mircea Gherzan <mgherzan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed900ffb

arch/arm/net/bpf_jit_32.c

+3 −15
Original line number Diff line number Diff line
@@ -900,8 +900,7 @@ void bpf_jit_compile(struct sk_filter *fp) 
#endif



	alloc_size = 4 * ctx.idx;

	ctx.target = module_alloc(max(sizeof(struct work_struct),

				      alloc_size));

	ctx.target = module_alloc(alloc_size);

	if (unlikely(ctx.target == NULL))

		goto out;
@@ -927,19 +926,8 @@ void bpf_jit_compile(struct sk_filter *fp) 
	return;

}



static void bpf_jit_free_worker(struct work_struct *work)

{

	module_free(NULL, work);

}



void bpf_jit_free(struct sk_filter *fp)

{

	struct work_struct *work;



	if (fp->bpf_func != sk_run_filter) {

		work = (struct work_struct *)fp->bpf_func;



		INIT_WORK(work, bpf_jit_free_worker);

		schedule_work(work);

	}

	if (fp->bpf_func != sk_run_filter)

		module_free(NULL, fp->bpf_func);

}