linux-ext4 - [PATCH 3/3] ext4: define visible/modifiable flag masks in terms of inode flags

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <72549a0cca1ccc4097deb19899aa9756f0397aa2.1515135646.git.tgnottingham@gmail.com>
Date:   Fri,  5 Jan 2018 01:23:25 -0800
From:   Tyson Nottingham <tgnottingham@...il.com>
To:     linux-ext4@...r.kernel.org
Cc:     tytso@....edu, adilger.kernel@...ger.ca,
        Tyson Nottingham <tgnottingham@...il.com>
Subject: [PATCH 3/3] ext4: define visible/modifiable flag masks in terms of inode flags

Define visible and modifiable inode flag masks in terms of inode flags
instead of hexadecimal to make it clearer which flags are included.

Signed-off-by: Tyson Nottingham <tgnottingham@...il.com>
---

I printed and diffed the flag values before and after to verify they match.

---
 fs/ext4/ext4.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 15 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6fd2698..9fe70ab 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -431,23 +431,66 @@ enum {
 #define EXT4_PROJINHERIT_FL	BIT(EXT4_INODE_PROJINHERIT)	/* Create with parents projid */
 #define EXT4_RESERVED_FL	BIT(EXT4_INODE_RESERVED)	/* reserved for ext4 lib */
 
-#define EXT4_FL_USER_VISIBLE		0x304BDFFF /* User visible flags */
-#define EXT4_FL_USER_MODIFIABLE		0x204BC0FF /* User modifiable flags */
-
-/* Flags we can manipulate with through EXT4_IOC_FSSETXATTR */
-#define EXT4_FL_XFLAG_VISIBLE		(EXT4_SYNC_FL | \
-					 EXT4_IMMUTABLE_FL | \
-					 EXT4_APPEND_FL | \
-					 EXT4_NODUMP_FL | \
-					 EXT4_NOATIME_FL | \
-					 EXT4_PROJINHERIT_FL)
+/* Flags we can manipulate through EXT4_IOC_GETFLAGS */
+#define EXT4_FL_USER_VISIBLE	(EXT4_SECRM_FL | \
+				 EXT4_UNRM_FL | \
+				 EXT4_COMPR_FL | \
+				 EXT4_SYNC_FL | \
+				 EXT4_IMMUTABLE_FL | \
+				 EXT4_APPEND_FL | \
+				 EXT4_NODUMP_FL | \
+				 EXT4_NOATIME_FL | \
+				 EXT4_DIRTY_FL | \
+				 EXT4_COMPRBLK_FL | \
+				 EXT4_NOCOMPR_FL | \
+				 EXT4_ENCRYPT_FL | \
+				 EXT4_INDEX_FL | \
+				 EXT4_JOURNAL_DATA_FL | \
+				 EXT4_NOTAIL_FL | \
+				 EXT4_DIRSYNC_FL | \
+				 EXT4_TOPDIR_FL | \
+				 EXT4_EXTENTS_FL | \
+				 EXT4_EOFBLOCKS_FL | \
+				 EXT4_INLINE_DATA_FL | \
+				 EXT4_PROJINHERIT_FL)
+
+/* Flags we can manipulate through EXT4_IOC_SETFLAGS */
+#define EXT4_FL_USER_MODIFIABLE	(EXT4_SECRM_FL | \
+				 EXT4_UNRM_FL | \
+				 EXT4_COMPR_FL | \
+				 EXT4_SYNC_FL | \
+				 EXT4_IMMUTABLE_FL | \
+				 EXT4_APPEND_FL | \
+				 EXT4_NODUMP_FL | \
+				 EXT4_NOATIME_FL | \
+				 EXT4_JOURNAL_DATA_FL | \
+				 EXT4_NOTAIL_FL | \
+				 EXT4_DIRSYNC_FL | \
+				 EXT4_TOPDIR_FL | \
+				 EXT4_EXTENTS_FL | \
+				 EXT4_EOFBLOCKS_FL | \
+				 EXT4_PROJINHERIT_FL)
+
+/* Flags we can manipulate through EXT4_IOC_FSSETXATTR */
+#define EXT4_FL_XFLAG_VISIBLE	(EXT4_SYNC_FL | \
+				 EXT4_IMMUTABLE_FL | \
+				 EXT4_APPEND_FL | \
+				 EXT4_NODUMP_FL | \
+				 EXT4_NOATIME_FL | \
+				 EXT4_PROJINHERIT_FL)
 
 /* Flags that should be inherited by new inodes from their parent. */
-#define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\
-			   EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\
-			   EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\
-			   EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL |\
-			   EXT4_PROJINHERIT_FL)
+#define EXT4_FL_INHERITED	(EXT4_SECRM_FL | \
+				 EXT4_UNRM_FL | \
+				 EXT4_COMPR_FL | \
+				 EXT4_SYNC_FL | \
+				 EXT4_NODUMP_FL | \
+				 EXT4_NOATIME_FL | \
+				 EXT4_NOCOMPR_FL | \
+				 EXT4_JOURNAL_DATA_FL | \
+				 EXT4_NOTAIL_FL | \
+				 EXT4_DIRSYNC_FL | \
+				 EXT4_PROJINHERIT_FL)
 
 /* Flags that are appropriate for regular files (all but dir-specific ones). */
 #define EXT4_REG_FLMASK (~(EXT4_DIRSYNC_FL | EXT4_TOPDIR_FL))
-- 
2.7.4