patch-2.2.11 linux/fs/ext2/ioctl.c

• Lines: 24
• Date: Mon Aug 9 12:04:41 1999
• Orig file: v2.2.10/linux/fs/ext2/ioctl.c
• Orig date: Wed May 6 10:56:05 1998

diff -u --recursive --new-file v2.2.10/linux/fs/ext2/ioctl.c linux/fs/ext2/ioctl.c
@@ -33,18 +33,17 @@
 		flags = flags & EXT2_FL_USER_MODIFIABLE;
 		/*
 		 * The IMMUTABLE and APPEND_ONLY flags can only be changed by
-		 * the super user when the security level is zero.
+		 * a process with the relevent capability.
 		 */
 		if ((flags & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) ^
 		    (inode->u.ext2_i.i_flags &
-		     (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL))) {
+		     (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)))
 			/* This test looks nicer. Thanks to Pauline Middelink */
 			if (!capable(CAP_LINUX_IMMUTABLE))
 				return -EPERM;
-		} else
-			if ((current->fsuid != inode->i_uid) && 
-			    !capable(CAP_FOWNER))
-				return -EPERM;
+
+		if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+			return -EPERM;
 		if (IS_RDONLY(inode))
 			return -EROFS;
 		inode->u.ext2_i.i_flags = (inode->u.ext2_i.i_flags &