Fix endian bugs accessing ioctl arguments that are passed by value.
Pointed out by: marius MFC after: 1 day
This commit is contained in:
parent
3b582b4e72
commit
af0618e9d4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=156226
@ -1023,14 +1023,14 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
|
||||
|
||||
case KDGKBMODE: /* get kyboard mode */
|
||||
KBDMUX_LOCK(state);
|
||||
*((int *) arg) = state->ks_mode;
|
||||
*((intptr_t *) arg) = state->ks_mode;
|
||||
KBDMUX_UNLOCK(state);
|
||||
break;
|
||||
|
||||
case KDSKBMODE: /* set keyboard mode */
|
||||
KBDMUX_LOCK(state);
|
||||
|
||||
switch (*((int *) arg)) {
|
||||
switch (*((intptr_t *) arg)) {
|
||||
case K_XLATE:
|
||||
if (state->ks_mode != K_XLATE) {
|
||||
/* make lock key state and LED state match */
|
||||
@ -1041,9 +1041,9 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
|
||||
|
||||
case K_RAW:
|
||||
case K_CODE:
|
||||
if (state->ks_mode != *((int *) arg)) {
|
||||
if (state->ks_mode != *((intptr_t *) arg)) {
|
||||
kbdmux_clear_state_locked(state);
|
||||
state->ks_mode = *((int *) arg);
|
||||
state->ks_mode = *((intptr_t *) arg);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1057,7 +1057,7 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
|
||||
|
||||
case KDGETLED: /* get keyboard LED */
|
||||
KBDMUX_LOCK(state);
|
||||
*((int *) arg) = KBD_LED_VAL(kbd);
|
||||
*((intptr_t *) arg) = KBD_LED_VAL(kbd);
|
||||
KBDMUX_UNLOCK(state);
|
||||
break;
|
||||
|
||||
@ -1065,13 +1065,13 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
|
||||
KBDMUX_LOCK(state);
|
||||
|
||||
/* NOTE: lock key state in ks_state won't be changed */
|
||||
if (*((int *) arg) & ~LOCK_MASK) {
|
||||
if (*((intptr_t *) arg) & ~LOCK_MASK) {
|
||||
KBDMUX_UNLOCK(state);
|
||||
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
KBD_LED_VAL(kbd) = *((int *) arg);
|
||||
KBD_LED_VAL(kbd) = *((intptr_t *) arg);
|
||||
|
||||
/* KDSETLED on all slave keyboards */
|
||||
SLIST_FOREACH(k, &state->ks_kbds, next)
|
||||
@ -1082,21 +1082,21 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
|
||||
|
||||
case KDGKBSTATE: /* get lock key state */
|
||||
KBDMUX_LOCK(state);
|
||||
*((int *) arg) = state->ks_state & LOCK_MASK;
|
||||
*((intptr_t *) arg) = state->ks_state & LOCK_MASK;
|
||||
KBDMUX_UNLOCK(state);
|
||||
break;
|
||||
|
||||
case KDSKBSTATE: /* set lock key state */
|
||||
KBDMUX_LOCK(state);
|
||||
|
||||
if (*((int *) arg) & ~LOCK_MASK) {
|
||||
if (*((intptr_t *) arg) & ~LOCK_MASK) {
|
||||
KBDMUX_UNLOCK(state);
|
||||
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
state->ks_state &= ~LOCK_MASK;
|
||||
state->ks_state |= *((int *) arg);
|
||||
state->ks_state |= *((intptr_t *) arg);
|
||||
|
||||
/* KDSKBSTATE on all slave keyboards */
|
||||
SLIST_FOREACH(k, &state->ks_kbds, next)
|
||||
@ -1116,17 +1116,17 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
|
||||
|
||||
/* lookup delay */
|
||||
for (i = sizeof(delays)/sizeof(delays[0]) - 1; i > 0; i --)
|
||||
if (((int *) arg)[0] >= delays[i])
|
||||
if (((intptr_t *) arg)[0] >= delays[i])
|
||||
break;
|
||||
mode = i << 5;
|
||||
|
||||
/* lookup rate */
|
||||
for (i = sizeof(rates)/sizeof(rates[0]) - 1; i > 0; i --)
|
||||
if (((int *) arg)[1] >= rates[i])
|
||||
if (((intptr_t *) arg)[1] >= rates[i])
|
||||
break;
|
||||
mode |= i;
|
||||
} else
|
||||
mode = *((int *) arg);
|
||||
mode = *((intptr_t *) arg);
|
||||
|
||||
if (mode & ~0x7f) {
|
||||
KBDMUX_UNLOCK(state);
|
||||
|
Loading…
Reference in New Issue
Block a user