From e6d7820ca82b7bbf697ee904c3bfe604ea59f330 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Tue, 18 Dec 2007 18:58:18 -0800
Subject: [PATCH] --- yaml --- r: 76947 b: refs/heads/master c:
 0957f00796157564281ea6ff2cea7ef4f897775a h: refs/heads/master i:   76945:
 01ae9faf700bffee4d9cd7d93df4965992f1bdff   76943:
 97605dd1590cd4cd76e7531414c1291027aeacd4 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/ioctl.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0a16669b21dd..e271e37edc30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7909f2bf835376a20d6dbf853eb459a27566eba2
+refs/heads/master: 0957f00796157564281ea6ff2cea7ef4f897775a
diff --git a/trunk/fs/ocfs2/ioctl.c b/trunk/fs/ocfs2/ioctl.c
index 7003d5820d79..5177fba5162b 100644
--- a/trunk/fs/ocfs2/ioctl.c
+++ b/trunk/fs/ocfs2/ioctl.c
@@ -144,12 +144,18 @@ int ocfs2_ioctl(struct inode * inode, struct file * filp,
 
 		return ocfs2_change_file_space(filp, cmd, &sr);
 	case OCFS2_IOC_GROUP_EXTEND:
+		if (!capable(CAP_SYS_RESOURCE))
+			return -EPERM;
+
 		if (get_user(new_clusters, (int __user *)arg))
 			return -EFAULT;
 
 		return ocfs2_group_extend(inode, new_clusters);
 	case OCFS2_IOC_GROUP_ADD:
 	case OCFS2_IOC_GROUP_ADD64:
+		if (!capable(CAP_SYS_RESOURCE))
+			return -EPERM;
+
 		if (copy_from_user(&input, (int __user *) arg, sizeof(input)))
 			return -EFAULT;