projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9abac85
)
vt: NULL dereference in vt_do_kdsk_ioctl()
author
Dan Carpenter
<dan.carpenter@oracle.com>
Sat, 10 Mar 2012 08:59:23 +0000
(11:59 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 12 Mar 2012 17:21:55 +0000
(10:21 -0700)
We forgot to set the "key_map" variable here, so it's still NULL. This
was introduced recently in
079c9534a9
"vt:tackle kbd_table".
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/keyboard.c
patch
|
blob
|
history
diff --git
a/drivers/tty/vt/keyboard.c
b/drivers/tty/vt/keyboard.c
index
70d0593
..
86dd1e3
100644
(file)
--- a/
drivers/tty/vt/keyboard.c
+++ b/
drivers/tty/vt/keyboard.c
@@
-1863,6
+1863,7
@@
int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
return -EPERM;
}
key_maps[s] = new_map;
+ key_map = new_map;
key_map[0] = U(K_ALLOCATED);
for (j = 1; j < NR_KEYS; j++)
key_map[j] = U(K_HOLE);