patch-2.1.75 linux/fs/ext2/acl.c

• Lines: 26
• Date: Sun Dec 21 17:41:24 1997
• Orig file: v2.1.74/linux/fs/ext2/acl.c
• Orig date: Tue Jul 2 09:08:42 1996

diff -u --recursive --new-file v2.1.74/linux/fs/ext2/acl.c linux/fs/ext2/acl.c
@@ -39,11 +39,7 @@
 	 */
 	if ((mask & S_IWOTH) && IS_IMMUTABLE(inode))
 		return -EACCES;
-	/*
-	 * Special case, access is always granted for root
-	 */
-	if (fsuser())
-		return 0;
+
 	/*
 	 * If no ACL, checks using the file mode
 	 */
@@ -51,7 +47,11 @@
 		mode >>= 6;
 	else if (in_group_p (inode->i_gid))
 		mode >>= 3;
-	if (((mode & mask & S_IRWXO) == mask))
+	/*
+	 * Access is always granted for root. We now check last,
+         * though, for BSD process accounting correctness
+	 */
+	if (((mode & mask & S_IRWXO) == mask) || fsuser())
 		return 0;
 	else
 		return -EACCES;