Module Name: src
Committed By: jakllsch
Date: Sun Jan 10 17:44:48 UTC 2016
Modified Files:
src/sys/dev/usb: hid.c
Log Message:
Fix hid_get_data() and hid_get_udata() for 32-bit report data on LP32.
(At least i386 anyway, not sure why ARMv7 doesn't show the same problem.)
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/hid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/hid.c
diff -u src/sys/dev/usb/hid.c:1.41 src/sys/dev/usb/hid.c:1.42
--- src/sys/dev/usb/hid.c:1.41 Sat Jan 9 03:33:53 2016
+++ src/sys/dev/usb/hid.c Sun Jan 10 17:44:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.c,v 1.41 2016/01/09 03:33:53 jakllsch Exp $ */
+/* $NetBSD: hid.c,v 1.42 2016/01/10 17:44:48 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.41 2016/01/09 03:33:53 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.42 2016/01/10 17:44:48 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -440,7 +440,7 @@ hid_get_data(const u_char *buf, const st
return (0);
data = hid_get_udata(buf, loc);
- if (data < (1UL << (hsize - 1)))
+ if (data < (1UL << (hsize - 1)) || hsize == sizeof(data) * NBBY)
return (data);
return data - (1UL << hsize);
}
@@ -464,7 +464,8 @@ hid_get_udata(const u_char *buf, const s
data |= buf[off + i] << (i * 8);
data >>= hpos % 8;
- data &= (1UL << hsize) - 1;
+ if (hsize < sizeof(data) * NBBY)
+ data &= (1UL << hsize) - 1;
DPRINTFN(10,("hid_get_udata: loc %d/%d = %lu\n", hpos, hsize, data));
return (data);
