---

yaml --- r: 198367 b: refs/heads/master c: 7df0e03 h: refs/heads/master i: 198365: 0ea24bb 198363: d8a8f81 198359: c03ed39 198351: 5224b30 198335: c65c4f4 v: v3
git-mirror · May 24, 2010 · 7ab90f6 · 7ab90f6
1 parent eca6a8e
commit 7ab90f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e
+refs/heads/master: 7df0e0397b9a18358573274db9fdab991941062f
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
@@ -218,6 +218,11 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
 	if (error)
 		goto out_drop_write;
 
+	error = -EACCES;
+	if (!is_owner_or_cap(inode))
+		goto out;
+
+	error = 0;
 	flags = ip->i_diskflags;
 	new_flags = (flags & ~mask) | (reqflags & mask);
 	if ((new_flags ^ flags) == 0)
@@ -275,8 +280,10 @@ static int gfs2_set_flags(struct file *filp, u32 __user *ptr)
 {
 	struct inode *inode = filp->f_path.dentry->d_inode;
 	u32 fsflags, gfsflags;
+
 	if (get_user(fsflags, ptr))
 		return -EFAULT;
+
 	gfsflags = fsflags_cvt(fsflags_to_gfs2, fsflags);
 	if (!S_ISDIR(inode->i_mode)) {
 		if (gfsflags & GFS2_DIF_INHERIT_JDATA)