iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vt: keyboard, union perm checks in vt_do_kdgkb_ioctl

Browse Source 
Do the permission check on a single place. That is where perm is
really checked.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20201029113222.32640-14-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby
2020-10-29 12:32:19 +01:00
committed by Greg Kroah-Hartman
parent 2374a04526
commit cb58a50460
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/vt/keyboard.c
View File

@ -2040,9 +2040,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
char *kbs;
int ret;
if (!capable(CAP_SYS_TTY_CONFIG))
perm = 0;
if (get_user(kb_func, &user_kdgkb->kb_func))
return -EFAULT;
@ -2067,7 +2064,7 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
break;
}
case KDSKBSENT:
if (!perm)
if (!perm || !capable(CAP_SYS_TTY_CONFIG))
return -EPERM;
kbs = strndup_user(user_kdgkb->kb_string,