bpf: Fix potential call bpf_link_free() in atomic context
authorMuchun Song <songmuchun@bytedance.com>
Thu, 17 Sep 2020 07:44:53 +0000 (15:44 +0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 21 Sep 2020 19:20:17 +0000 (21:20 +0200)
The in_atomic() macro cannot always detect atomic context, in particular,
it cannot know about held spinlocks in non-preemptible kernels. Although,
there is no user call bpf_link_put() with holding spinlock now, be on the
safe side, so we can avoid this in the future.

Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200917074453.20621-1-songmuchun@bytedance.com
kernel/bpf/syscall.c

index 2ce32cad5c8e5d975c41daff80816e5f83678d54..ec68d3a23a2b75f68828496f1938de00e0184a4f 100644 (file)
@@ -2345,12 +2345,8 @@ void bpf_link_put(struct bpf_link *link)
        if (!atomic64_dec_and_test(&link->refcnt))
                return;
 
-       if (in_atomic()) {
-               INIT_WORK(&link->work, bpf_link_put_deferred);
-               schedule_work(&link->work);
-       } else {
-               bpf_link_free(link);
-       }
+       INIT_WORK(&link->work, bpf_link_put_deferred);
+       schedule_work(&link->work);
 }
 
 static int bpf_link_release(struct inode *inode, struct file *filp)