From 85c96441c0207297072716293517434ce7ffe300 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 30 Oct 2005 15:03:02 -0800
Subject: [PATCH] --- yaml --- r: 11868 b: refs/heads/master c:
 0b360adbdb54d5b98b78d57ba0916bc4b8871968 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/vt_ioctl.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 833d7c789e08..9865d1fbd15f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb8e317998e55dc1f9e6288564052b577327b766
+refs/heads/master: 0b360adbdb54d5b98b78d57ba0916bc4b8871968
diff --git a/trunk/drivers/char/vt_ioctl.c b/trunk/drivers/char/vt_ioctl.c
index 1d44f69e1fda..003dda147cd0 100644
--- a/trunk/drivers/char/vt_ioctl.c
+++ b/trunk/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;