From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> Before prepending the Report ID check if it is non-zero: BLUETOOTH SPECIFICATION Page 16 of 26 HID Service Specification Report ID shall be nonzero in a Report Reference characteristic descriptor where there is more than one instance of the Report characteristic for any given Report Type. Fixes: https://github.com/bluez/bluez/issues/334 Fixes: https://github.com/bluez/bluez/issues/320 Fixes: https://www.spinics.net/lists/linux-bluetooth/msg97262.html --- profiles/input/hog-lib.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c index b611f6b4a..e69ea1ba4 100644 --- a/profiles/input/hog-lib.c +++ b/profiles/input/hog-lib.c @@ -348,7 +348,14 @@ static void report_value_cb(const guint8 *pdu, guint16 len, gpointer user_data) ev.type = UHID_INPUT; buf = ev.u.input.data; - if (report->numbered) { + /* BLUETOOTH SPECIFICATION Page 16 of 26 + * HID Service Specification + * + * Report ID shall be nonzero in a Report Reference characteristic + * descriptor where there is more than one instance of the Report + * characteristic for any given Report Type. + */ + if (report->numbered && report->id) { buf[0] = report->id; len = MIN(len, sizeof(ev.u.input.data) - 1); memcpy(buf + 1, pdu, len); -- 2.35.1
