]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
hid: bpf: add BPF_JIT dependency
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Jul 2024 09:51:07 +0000 (11:51 +0200)
committerBenjamin Tissoires <bentiss@kernel.org>
Mon, 22 Jul 2024 14:52:05 +0000 (16:52 +0200)
The module does not do anything when the JIT is disabled, but instead
causes a warning:

In file included from include/linux/bpf_verifier.h:7,
                 from drivers/hid/bpf/hid_bpf_struct_ops.c:10:
drivers/hid/bpf/hid_bpf_struct_ops.c: In function 'hid_bpf_struct_ops_init':
include/linux/bpf.h:1853:50: error: statement with no effect [-Werror=unused-value]
 1853 | #define register_bpf_struct_ops(st_ops, type) ({ (void *)(st_ops); 0; })
      |                                                  ^~~~~~~~~~~~~~~~
drivers/hid/bpf/hid_bpf_struct_ops.c:305:16: note: in expansion of macro 'register_bpf_struct_ops'
  305 |         return register_bpf_struct_ops(&bpf_hid_bpf_ops, hid_bpf_ops);
      |                ^~~~~~~~~~~~~~~~~~~~~~~

Add a Kconfig dependency to only allow building the HID-BPF support
when a JIT is enabled.

Fixes: ebc0d8093e8c ("HID: bpf: implement HID-BPF through bpf_struct_ops")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/96a00b6f-eb81-4c67-8c4b-6b1f3f045034@app.fastmail.com
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/bpf/Kconfig

index 83214bae67687ab497cfd7bc3116c528dcd6a2f6..d65482e02a6c27bf4bc1ab41bf66df2ba0a98041 100644 (file)
@@ -3,7 +3,7 @@ menu "HID-BPF support"
 
 config HID_BPF
        bool "HID-BPF support"
-       depends on BPF
+       depends on BPF_JIT
        depends on BPF_SYSCALL
        depends on DYNAMIC_FTRACE_WITH_DIRECT_CALLS
        help