Module Name: src
Committed By: riastradh
Date: Sat Jan 23 17:02:25 UTC 2016
Modified Files:
src/sys/dev/usb: hid.c
Log Message:
Convert unsigned char to wider type before left shift.
Avoids undefined behaviour if shifted quantity overflows int.
CID 980971
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 src/sys/dev/usb/hid.c:1.43
--- src/sys/dev/usb/hid.c:1.42 Sun Jan 10 17:44:48 2016
+++ src/sys/dev/usb/hid.c Sat Jan 23 17:02:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.c,v 1.42 2016/01/10 17:44:48 jakllsch Exp $ */
+/* $NetBSD: hid.c,v 1.43 2016/01/23 17:02:25 riastradh 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.42 2016/01/10 17:44:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.43 2016/01/23 17:02:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -461,7 +461,7 @@ hid_get_udata(const u_char *buf, const s
num = (hpos + hsize + 7) / 8 - off;
for (i = 0; i < num; i++)
- data |= buf[off + i] << (i * 8);
+ data |= (unsigned long)buf[off + i] << (i * 8);
data >>= hpos % 8;
if (hsize < sizeof(data) * NBBY)
