fs: Rename SB_I_EVM_UNSUPPORTED to SB_I_EVM_HMAC_UNSUPPORTED

Now that EVM supports RSA signatures for previously completely
unsupported filesystems rename the flag SB_I_EVM_UNSUPPORTED to
SB_I_EVM_HMAC_UNSUPPORTED to reflect that only HMAC is not supported.

Suggested-by: Amir Goldstein <amir73il@gmail.com>
Suggested-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index a40fc7e0552594c2942559107d7846ec9168d752..06a231970cb57269dbd59ac88c6cc5b9fe85fd4f 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1460,7 +1460,7 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)
         * lead to unexpected results.
         */
        sb->s_iflags |= SB_I_NOUMASK;
-       sb->s_iflags |= SB_I_EVM_UNSUPPORTED;
+       sb->s_iflags |= SB_I_EVM_HMAC_UNSUPPORTED;
 
        err = -ENOMEM;
        root_dentry = ovl_get_root(sb, ctx->upper.dentry, oe);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8dfd53b52744a4dfffb8ccb350364972658f00eb..7bbd5e2d2a20cbffb70407331dc53864160e496e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1177,7 +1177,7 @@ extern int send_sigurg(struct fown_struct *fown);
 #define SB_I_USERNS_VISIBLE            0x00000010 /* fstype already mounted */
 #define SB_I_IMA_UNVERIFIABLE_SIGNATURE        0x00000020
 #define SB_I_UNTRUSTED_MOUNTER         0x00000040
-#define SB_I_EVM_UNSUPPORTED           0x00000080
+#define SB_I_EVM_HMAC_UNSUPPORTED      0x00000080
 
 #define SB_I_SKIP_SYNC 0x00000100      /* Skip superblock at global sync */
 #define SB_I_PERSB_BDI 0x00000200      /* has a per-sb bdi */

diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index cfb4f980936951f14d98a16f8c723442a85a8086..c4a6081ce59627405ea60518dcc5e87e30c033eb 100644 (file)
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -155,7 +155,7 @@ static int is_unsupported_fs(struct dentry *dentry)
 {
        struct inode *inode = d_backing_inode(dentry);
 
-       if (inode->i_sb->s_iflags & SB_I_EVM_UNSUPPORTED) {
+       if (inode->i_sb->s_iflags & SB_I_EVM_HMAC_UNSUPPORTED) {
                pr_info_once("%s not supported\n", inode->i_sb->s_type->name);
                return 1;
        }