Skip to content

Commit 1f65e57

Browse files
stefanbergermimizohar
authored andcommitted
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 <[email protected]> Suggested-by: Mimi Zohar <[email protected]> Signed-off-by: Stefan Berger <[email protected]> Acked-by: Amir Goldstein <[email protected]> Signed-off-by: Mimi Zohar <[email protected]>
1 parent 47add87 commit 1f65e57

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/overlayfs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,7 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)
14601460
* lead to unexpected results.
14611461
*/
14621462
sb->s_iflags |= SB_I_NOUMASK;
1463-
sb->s_iflags |= SB_I_EVM_UNSUPPORTED;
1463+
sb->s_iflags |= SB_I_EVM_HMAC_UNSUPPORTED;
14641464

14651465
err = -ENOMEM;
14661466
root_dentry = ovl_get_root(sb, ctx->upper.dentry, oe);

include/linux/fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ extern int send_sigurg(struct fown_struct *fown);
11771177
#define SB_I_USERNS_VISIBLE 0x00000010 /* fstype already mounted */
11781178
#define SB_I_IMA_UNVERIFIABLE_SIGNATURE 0x00000020
11791179
#define SB_I_UNTRUSTED_MOUNTER 0x00000040
1180-
#define SB_I_EVM_UNSUPPORTED 0x00000080
1180+
#define SB_I_EVM_HMAC_UNSUPPORTED 0x00000080
11811181

11821182
#define SB_I_SKIP_SYNC 0x00000100 /* Skip superblock at global sync */
11831183
#define SB_I_PERSB_BDI 0x00000200 /* has a per-sb bdi */

security/integrity/evm/evm_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static int is_unsupported_fs(struct dentry *dentry)
155155
{
156156
struct inode *inode = d_backing_inode(dentry);
157157

158-
if (inode->i_sb->s_iflags & SB_I_EVM_UNSUPPORTED) {
158+
if (inode->i_sb->s_iflags & SB_I_EVM_HMAC_UNSUPPORTED) {
159159
pr_info_once("%s not supported\n", inode->i_sb->s_type->name);
160160
return 1;
161161
}

0 commit comments

Comments
 (0)