diff mbox series

HID: bpf: fix hid_bpf_input_report() when hid-core is not ready

Message ID 20240411-fix-hid-bpf-v1-1-4ae913031a8c@kernel.org
State Accepted
Commit b912cf042072e12e93faa874265b30cc0aa521b9
Headers show
Series HID: bpf: fix hid_bpf_input_report() when hid-core is not ready | expand

Commit Message

Benjamin Tissoires April 11, 2024, 7:05 a.m. UTC 
Reported by linux-next:
After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

x86_64-linux-gnu-ld: vmlinux.o: in function `hid_bpf_input_report':
(.text+0x1c75181): undefined reference to `hid_input_report'

Caused by commit 9be50ac30a83 ("HID: bpf: allow to inject HID event
from BPF")

I just forgot to put the indirection in place.

Link: https://lore.kernel.org/linux-kernel/20240411105131.7830f966@canb.auug.org.au/
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
---
Seems like an overlook in my patch.
---
 drivers/hid/bpf/hid_bpf_dispatch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: 685dadafbde29dc3d6b7a13be284d684b06d4d4f
change-id: 20240411-fix-hid-bpf-fb67411ac650

Best regards,

Comments

Jiri Kosina April 11, 2024, 9:08 a.m. UTC | #1 
On Thu, 11 Apr 2024, Benjamin Tissoires wrote:

> Reported by linux-next:
> After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> x86_64-linux-gnu-ld: vmlinux.o: in function `hid_bpf_input_report':
> (.text+0x1c75181): undefined reference to `hid_input_report'
> 
> Caused by commit 9be50ac30a83 ("HID: bpf: allow to inject HID event
> from BPF")
> 
> I just forgot to put the indirection in place.
> 
> Link: https://lore.kernel.org/linux-kernel/20240411105131.7830f966@canb.auug.org.au/
> Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>

Please also include Fixes: tag.

Thanks,
Benjamin Tissoires April 11, 2024, 9:57 a.m. UTC | #2 
On Apr 11 2024, Benjamin Tissoires wrote:
> On Apr 11 2024, Jiri Kosina wrote:
> > On Thu, 11 Apr 2024, Benjamin Tissoires wrote:
> > 
> > > Reported by linux-next:
> > > After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > > 
> > > x86_64-linux-gnu-ld: vmlinux.o: in function `hid_bpf_input_report':
> > > (.text+0x1c75181): undefined reference to `hid_input_report'
> > > 
> > > Caused by commit 9be50ac30a83 ("HID: bpf: allow to inject HID event
> > > from BPF")
> > > 
> > > I just forgot to put the indirection in place.
> > > 
> > > Link: https://lore.kernel.org/linux-kernel/20240411105131.7830f966@canb.auug.org.au/
> > > Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
> > 
> > Please also include Fixes: tag.
> 
> Oops, correct. I'll add the following (in case b4 is smart enough to
> pick it up by itself):

FTR, b4 is actually smart enough to pick this one up :)

> 
> Fixes: 9be50ac30a83 ("HID: bpf: allow to inject HID event from BPF")
> 
Cheers,
Benjamin
diff mbox series

Patch

diff --git a/drivers/hid/bpf/hid_bpf_dispatch.c b/drivers/hid/bpf/hid_bpf_dispatch.c
index 79ece3d1b9e2..10289f44d0cc 100644
--- a/drivers/hid/bpf/hid_bpf_dispatch.c
+++ b/drivers/hid/bpf/hid_bpf_dispatch.c
@@ -534,7 +534,7 @@  hid_bpf_input_report(struct hid_bpf_ctx *ctx, enum hid_report_type type, u8 *buf
 
 	hdev = (struct hid_device *)ctx->hid; /* discard const */
 
-	return hid_input_report(hdev, type, buf, size, 0);
+	return hid_bpf_ops->hid_input_report(hdev, type, buf, size, 0);
 }
 __bpf_kfunc_end_defs();