Merge branch 'master'

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 1d44f69e1fda..003dda147cd0 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -192,6 +192,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
         int i, j, k;
         int ret;
 
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                return -EPERM;
+
         kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
         if (!kbs) {
                 ret = -ENOMEM;