HID: bpf: return non NULL data pointer when CONFIG_HID_BPF is not set
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 16 Nov 2022 10:31:10 +0000 (11:31 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 Nov 2022 22:00:20 +0000 (23:00 +0100)
dispatch_hid_bpf_device_event() is supposed to return either an error,
or a valid pointer to memory containing the data.

Returning NULL simply makes a segfault when CONFIG_HID_BPF is not set
for any processed event.

Fixes: 658ee5a64fcfbbf ("HID: bpf: allocate data memory for device_event BPF program")
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
include/linux/hid_bpf.h

index 9b11f8f..3ca85ab 100644 (file)
@@ -148,7 +148,7 @@ void hid_bpf_device_init(struct hid_device *hid);
 u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *size);
 #else /* CONFIG_HID_BPF */
 static inline u8 *dispatch_hid_bpf_device_event(struct hid_device *hid, enum hid_report_type type,
-                                               u8 *data, u32 *size, int interrupt) { return NULL; }
+                                               u8 *data, u32 *size, int interrupt) { return data; }
 static inline int hid_bpf_connect_device(struct hid_device *hdev) { return 0; }
 static inline void hid_bpf_disconnect_device(struct hid_device *hdev) {}
 static inline void hid_bpf_destroy_device(struct hid_device *hid) {}