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

Do not pass an address to local stack variable to usbd_set_report_async.

Browse Source 
Allocate space in keyboard state structure instead to prevent random byte
from possibly overwritten stack location frombeing shoved into USB device
when transfer actually takes place.

This fixes at least one instance of LEDs not working with USB keyboards.
This commit is contained in:
Alexander Kabaev 2007-11-05 19:51:12 +00:00
parent 171eb887e9
commit 907aa90518
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/usb/ukbd.c
View File

@ -370,6 +370,7 @@ typedef struct ukbd_state {
u_int ks_composed_char; /* composed char code (> 0) */
#ifdef UKBD_EMULATE_ATSCANCODE
u_int ks_buffered_char[2];
u_int8_t ks_leds; /* store for async led requests */
#endif
} ukbd_state_t;
@ -1469,11 +1470,11 @@ bLength=%d bDescriptorType=%d bEndpointAddress=%d-%s bmAttributes=%d wMaxPacketS
static void
set_leds(ukbd_state_t *state, int leds)
{
u_int8_t res = leds;
DPRINTF(("ukbd:set_leds: state=%p leds=%d\n", state, leds));
usbd_set_report_async(state->ks_iface, UHID_OUTPUT_REPORT, 0, &res, 1);
state->ks_leds = leds;
usbd_set_report_async(state->ks_iface, UHID_OUTPUT_REPORT, 0,
&state->ks_leds, 1);
}
static int