arm: bpf_jit: can call module_free() from any context
authorDaniel Borkmann <dborkman@redhat.com>
Mon, 20 May 2013 08:05:51 +0000 (08:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 May 2013 21:03:50 +0000 (14:03 -0700)
Follow-up on module_free()/vfree() that takes care of the rest, so no
longer this workaround with work_struct needed.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Mircea Gherzan <mgherzan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/arm/net/bpf_jit_32.c

index 1a643ee..f50d223 100644 (file)
@@ -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 @@ out:
        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);
 }