Commit f23aa4c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hid-for-linus-2024090201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID fix from Benjamin Tissoires:

 - A small fix from the new HID-BPF code.

   The HID-BPF CI started failing completely because the BPF tree is now
   stricter, exposing a problem in the hid_bpf_ops.

* tag 'hid-for-linus-2024090201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: bpf: fix cfi stubs for hid_bpf_ops
parents 0d2746a2 acd5f76f

drivers/hid/bpf/hid_bpf_struct_ops.c

+14 −0
Original line number Diff line number Diff line
@@ -276,9 +276,23 @@ static int __hid_bpf_rdesc_fixup(struct hid_bpf_ctx *ctx) 
	return 0;

}



static int __hid_bpf_hw_request(struct hid_bpf_ctx *ctx, unsigned char reportnum,

				enum hid_report_type rtype, enum hid_class_request reqtype,

				u64 source)

{

	return 0;

}



static int __hid_bpf_hw_output_report(struct hid_bpf_ctx *ctx, u64 source)

{

	return 0;

}



static struct hid_bpf_ops __bpf_hid_bpf_ops = {

	.hid_device_event = __hid_bpf_device_event,

	.hid_rdesc_fixup = __hid_bpf_rdesc_fixup,

	.hid_hw_request = __hid_bpf_hw_request,

	.hid_hw_output_report = __hid_bpf_hw_output_report,

};



static struct bpf_struct_ops bpf_hid_bpf_ops = {