Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hid_get_data() for negative or 32-bit report data.

Browse Source
This commit is contained in:
jakllsch 2016-01-01 22:59:12 +00:00
parent bc1f6fc421
commit c8b0c3452c
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libusbhid/data.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: data.c,v 1.6 2010/05/12 18:28:20 plunky Exp $ */ /* $NetBSD: data.c,v 1.7 2016/01/01 22:59:12 jakllsch Exp $ */
/* /*
* Copyright (c) 1999 Lennart Augustsson <augustss@NetBSD.org> * Copyright (c) 1999 Lennart Augustsson <augustss@NetBSD.org>
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: data.c,v 1.6 2010/05/12 18:28:20 plunky Exp $"); __RCSID("$NetBSD: data.c,v 1.7 2016/01/01 22:59:12 jakllsch Exp $");
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
@ -57,10 +57,12 @@ hid_get_data(const void *p, const hid_item_t *h)
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
data |= buf[offs + i] << (i*8); data |= buf[offs + i] << (i*8);
data >>= hpos % 8; data >>= hpos % 8;
data &= (1 << hsize) - 1; if (hsize < 32) {
if (h->logical_minimum < 0 && (data & (1<<(hsize-1)))) { data &= (1 << hsize) - 1;
/* Need to sign extend */ if (h->logical_minimum < 0 && (data & (1<<(hsize-1)))) {
data |= 0xffffffff & ~((1<<hsize)-1); /* Need to sign extend */
data |= 0xffffffff & ~((1<<hsize)-1);
}
} }
return (int)(data); return (int)(data);
} }

7
tests/lib/libusbhid/t_usbhid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: t_usbhid.c,v 1.2 2016/01/01 22:47:34 jakllsch Exp $ */ /* $NetBSD: t_usbhid.c,v 1.3 2016/01/01 22:59:12 jakllsch Exp $ */
/* /*
* Copyright (c) 2016 Jonathan A. Kollasch * Copyright (c) 2016 Jonathan A. Kollasch
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: t_usbhid.c,v 1.2 2016/01/01 22:47:34 jakllsch Exp $"); __RCSID("$NetBSD: t_usbhid.c,v 1.3 2016/01/01 22:59:12 jakllsch Exp $");
#include <atf-c.h> #include <atf-c.h>
@ -326,9 +326,6 @@ ATF_TC_BODY(check_hid_get_data, tc)
int32_t data; int32_t data;
uint32_t udat; uint32_t udat;
atf_tc_expect_fail("all negative data doesn't work, "
"all 32-bit data doesn't work");
ATF_REQUIRE((hrd = hid_use_report_desc( ATF_REQUIRE((hrd = hid_use_report_desc(
range_test_report_descriptor, range_test_report_descriptor,
__arraycount(range_test_report_descriptor))) != NULL); __arraycount(range_test_report_descriptor))) != NULL);