From 68d086b61ccc6c9c8a25e6fa9bb4e5bdb21400db Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Fri, 8 Feb 2008 04:18:45 -0800
Subject: [PATCH] --- yaml --- r: 84630 b: refs/heads/master c:
 4129a6454dd925560bf3f46a12eb9f01cf8d5e7e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6415e3232de4..f59390f0b23a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6df3526b6649e57a414ba6b4179655341affcf46
+refs/heads/master: 4129a6454dd925560bf3f46a12eb9f01cf8d5e7e
diff --git a/trunk/drivers/char/rocket.c b/trunk/drivers/char/rocket.c
index cbee71bab017..72f289279d8f 100644
--- a/trunk/drivers/char/rocket.c
+++ b/trunk/drivers/char/rocket.c
@@ -1399,6 +1399,9 @@ static int reset_rm2(struct r_port *info, void __user *arg)
 {
 	int reset;
 
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
+
 	if (copy_from_user(&reset, arg, sizeof (int)))
 		return -EFAULT;
 	if (reset)