Module Name: src
Committed By: snj
Date: Fri Feb 26 21:34:27 UTC 2016
Modified Files:
src/sys/dev/usb [netbsd-7]: hid.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1089):
sys/dev/usb/hid.c: revision 1.43
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.35.14.1 -r1.35.14.2 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.35.14.1 src/sys/dev/usb/hid.c:1.35.14.2
--- src/sys/dev/usb/hid.c:1.35.14.1 Mon Feb 9 09:43:09 2015
+++ src/sys/dev/usb/hid.c Fri Feb 26 21:34:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.c,v 1.35.14.1 2015/02/09 09:43:09 martin Exp $ */
+/* $NetBSD: hid.c,v 1.35.14.2 2016/02/26 21:34:27 snj 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.35.14.1 2015/02/09 09:43:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.35.14.2 2016/02/26 21:34:27 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -455,7 +455,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;
data &= (1 << hsize) - 1;
