Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3f17f0f authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Linus Torvalds
Browse files

[PATCH] Only disallow _setting_ of function key string 



Mikael Pettersson <mikpe@csd.uu.se> noted that the current 2.6-git (and 2.4)
patch to disallow KDSKBSENT for unpriviledged users should be less restrictive
allowing reading of current function key string entry, but not writing.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 796f8d9b

drivers/char/vt_ioctl.c

+4 −1
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str 
	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))

		return -EFAULT;



	if (!capable(CAP_SYS_TTY_CONFIG))

		perm = 0;



	switch (cmd) {

	case KDGKBENT:

		key_map = key_maps[s];
@@ -193,7 +196,7 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) 
	int ret;



	if (!capable(CAP_SYS_TTY_CONFIG))

		return -EPERM;

		perm = 0;



	kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);

	if (!kbs) {