git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tty/vt/keyboard: fix OOB access in do_compute_shiftstate()
[pandora-kernel.git]
/
drivers
/
tty
/
vt
/
keyboard.c
diff --git
a/drivers/tty/vt/keyboard.c
b/drivers/tty/vt/keyboard.c
index
a605549
..
89c07d6
100644
(file)
--- a/
drivers/tty/vt/keyboard.c
+++ b/
drivers/tty/vt/keyboard.c
@@
-386,34
+386,22
@@
static void to_utf8(struct vc_data *vc, uint c)
*/
void compute_shiftstate(void)
{
*/
void compute_shiftstate(void)
{
- unsigned int
i, j,
k, sym, val;
+ unsigned int k, sym, val;
shift_state = 0;
memset(shift_down, 0, sizeof(shift_down));
shift_state = 0;
memset(shift_down, 0, sizeof(shift_down));
- for
(i = 0; i < ARRAY_SIZE(key_down); i++
) {
-
- if (
!key_down[i]
)
+ for
_each_set_bit(k, key_down, min(NR_KEYS, KEY_CNT)
) {
+ sym = U(key_maps[0][k]);
+ if (
KTYP(sym) != KT_SHIFT && KTYP(sym) != KT_SLOCK
)
continue;
continue;
- k = i * BITS_PER_LONG;
-
- for (j = 0; j < BITS_PER_LONG; j++, k++) {
-
- if (!test_bit(k, key_down))
- continue;
+ val = KVAL(sym);
+ if (val == KVAL(K_CAPSSHIFT))
+ val = KVAL(K_SHIFT);
- sym = U(key_maps[0][k]);
- if (KTYP(sym) != KT_SHIFT && KTYP(sym) != KT_SLOCK)
- continue;
-
- val = KVAL(sym);
- if (val == KVAL(K_CAPSSHIFT))
- val = KVAL(K_SHIFT);
-
- shift_down[val]++;
- shift_state |= (1 << val);
- }
+ shift_down[val]++;
+ shift_state |= BIT(val);
}
}
}
}