Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / drivers / char / rocket.c

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index cbee71bab01787102245fc8fa86a74a797898b11..72f289279d8ff0af1c2601d0fb68197faaede9f4 100644 (file)
--- a/drivers/char/rocket.c
+++ b/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)