diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/char/vt_ioctl.c | |
| parent | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines (diff) | |
| parent | [PATCH] Fix sysctl unregistration oops (CVE-2005-2709) (diff) | |
| download | linux-a892acacd3a8546ac161526522f13b5174f2c471.tar.xz linux-a892acacd3a8546ac161526522f13b5174f2c471.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/vt_ioctl.c')
| -rw-r--r-- | drivers/char/vt_ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 003dda147cd0..24011e7c81ff 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -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) { |