diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2020-10-29 12:32:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-04 16:43:38 +0100 |
| commit | cb58a5046095c0b28031f1f412c27ce21df604ae (patch) | |
| tree | c2c4e525870dbf0b4b1f5f89ff8f1f2a79dcc1c7 /drivers/tty/vt/keyboard.c | |
| parent | vt: keyboard, remove unneeded func_* declarations (diff) | |
| download | linux-cb58a5046095c0b28031f1f412c27ce21df604ae.tar.xz linux-cb58a5046095c0b28031f1f412c27ce21df604ae.zip | |
vt: keyboard, union perm checks in vt_do_kdgkb_ioctl
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>
Diffstat (limited to 'drivers/tty/vt/keyboard.c')
| -rw-r--r-- | drivers/tty/vt/keyboard.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 648bdfb05e25..1de0d5217aed 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -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, |