Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

evm: add file system uuid to EVM hmac

EVM uses the same key for all file systems to calculate the HMAC,
making it possible to paste inodes from one file system on to another
one, without EVM being able to detect it. To prevent such an attack,
it is necessary to make the EVM HMAC file system specific.

This patch uses the file system UUID, a file system unique identifier,
to bind the EVM HMAC to the file system. The value inode->i_sb->s_uuid
is used for the HMAC hash calculation, instead of using it for deriving
the file system specific key. Initializing the key for every inode HMAC
calculation is a bit more expensive operation than adding the uuid to
the HMAC hash.

Changing the HMAC calculation method or adding additional info to the
calculation, requires existing EVM labeled file systems to be relabeled.
This patch adds a Kconfig HMAC version option for backwards compatability.

Changelog v1:
- squash "hmac version setting"
Changelog v0:
- add missing Kconfig depends (Mimi)

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

authored by

Dmitry Kasatkin and committed by
Mimi Zohar
74de6684 6e38bfaa

+18
+13
security/integrity/evm/Kconfig
··· 11 11 integrity attacks. 12 12 13 13 If you are unsure how to answer this question, answer N. 14 + 15 + config EVM_HMAC_VERSION 16 + int "EVM HMAC version" 17 + depends on EVM 18 + default 2 19 + help 20 + This options adds EVM HMAC version support. 21 + 1 - original version 22 + 2 - add per filesystem unique identifier (UUID) (default) 23 + 24 + WARNING: changing the HMAC calculation method or adding 25 + additional info to the calculation, requires existing EVM 26 + labeled file systems to be relabeled.
+1
security/integrity/evm/evm.h
··· 24 24 extern int evm_initialized; 25 25 extern char *evm_hmac; 26 26 extern char *evm_hash; 27 + extern int evm_hmac_version; 27 28 28 29 extern struct crypto_shash *hmac_tfm; 29 30 extern struct crypto_shash *hash_tfm;
+3
security/integrity/evm/evm_crypto.c
··· 110 110 hmac_misc.gid = from_kgid(&init_user_ns, inode->i_gid); 111 111 hmac_misc.mode = inode->i_mode; 112 112 crypto_shash_update(desc, (const u8 *)&hmac_misc, sizeof hmac_misc); 113 + if (evm_hmac_version > 1) 114 + crypto_shash_update(desc, inode->i_sb->s_uuid, 115 + sizeof(inode->i_sb->s_uuid)); 113 116 crypto_shash_final(desc, digest); 114 117 } 115 118
+1
security/integrity/evm/evm_main.c
··· 26 26 27 27 char *evm_hmac = "hmac(sha1)"; 28 28 char *evm_hash = "sha1"; 29 + int evm_hmac_version = CONFIG_EVM_HMAC_VERSION; 29 30 30 31 char *evm_config_xattrnames[] = { 31 32 #ifdef CONFIG_SECURITY_SELINUX