d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use hid_get_data_unsigned() instead of hid_get_data() when reading the

Browse Source 
key-codes from the USB keyboard. Negative key-codes are currently skipped.

While at it use the bit size value provided by the HID location structure
instead of assuming a value of 8.

This fixes a regression issue after r357861.

Reported by:	Minoru TANABE <kotanabe3@gmail.com>
PR:	224592
PR:	233884
MFC after:	3 days
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2020-02-25 12:56:06 +00:00
parent bebf52f1ec
commit 0ba490729b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/input/ukbd.c
View File

@ -702,13 +702,15 @@ ukbd_intr_callback(struct usb_xfer *xfer, usb_error_t error)
} else if (id != sc->sc_id_loc_key[i]) {
continue; /* invalid HID ID */
} else if (i == 0) {
offset = sc->sc_loc_key[0].count;
if (offset < 0 || offset > len)
offset = len;
while (offset--) {
struct hid_location tmp_loc = sc->sc_loc_key[0];
/* range check array size */
if (tmp_loc.count > UKBD_NKEYCODE)
tmp_loc.count = UKBD_NKEYCODE;
while (tmp_loc.count--) {
uint32_t key =
hid_get_data(sc->sc_buffer + offset, len - offset,
&sc->sc_loc_key[i]);
hid_get_data_unsigned(sc->sc_buffer, len, &tmp_loc);
/* advance to next location */
tmp_loc.pos += tmp_loc.size;
if (modifiers & MOD_FN)
key = ukbd_apple_fn(key);
if (sc->sc_flags & UKBD_FLAG_APPLE_SWAP)