evm: calculate HMAC after initializing posix acl
Subsystems (6)
PATCH 1/3 evm: calculate HMAC after initializing posix acl
(Reposting with expanded 'cc' list.)
Included in the EVM hmac calculation is the i_mode. Any changes to the i_mode need to be reflected in the hmac. shmem_mknod() currently calls posix_acl_init(), which modifies the i_mode, after calling security_inode_init_security(). This patch reverses the order in which they are called.
--- mm/shmem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
mm/shmem.c +8 -8
@@ -1937,6 +1937,13 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) inode =shmem_get_inode (dir->i_sb, dir, mode, dev,VM_NORESERVE );if (inode) { +#ifdef CONFIG_TMPFS_POSIX_ACL + error =generic_acl_init (inode, dir); +if (error) { +iput (inode); +return error; + } +#endif error =security_inode_init_security (inode, dir, &dentry->d_name, shmem_initxattrs,NULL );
@@ -1946,15 +1953,8 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)return error; } } -#ifdef CONFIG_TMPFS_POSIX_ACL - error =generic_acl_init (inode, dir); -if (error) { -iput (inode); -return error; - } -#else + error =0 ; -#endif dir->i_size +=BOGO_DIRENT_SIZE ; dir->i_ctime = dir->i_mtime =CURRENT_TIME ;d_instantiate (dentry, inode);
Signature · 1 line
1.8.1.rc3
PATCH 2/3 integrity: move integrity_audit_msg()
This patch moves the integrity_audit_msg() function and defintion to security/integrity/, the parent directory, renames the 'ima_audit' boot command line option to 'integrity_audit', and fixes the Kconfig help text to reflect the actual code.
--- Documentation/kernel-parameters.txt | 10 +++--- security/integrity/Kconfig | 15 +++++++++ security/integrity/Makefile | 1 + security/integrity/ima/Kconfig | 12 ------- security/integrity/ima/Makefile | 1 - security/integrity/ima/ima.h | 14 -------- security/integrity/ima/ima_audit.c | 64 ------------------------------------ security/integrity/integrity.h | 14 ++++++++ security/integrity/integrity_audit.c | 64 ++++++++++++++++++++++++++++++++++++ 9 files changed, 99 insertions(+), 96 deletions(-) delete mode 100644 security/integrity/ima/ima_audit.c create mode 100644 security/integrity/integrity_audit.c
Documentation/kernel-parameters.txt +5 -5
@@ -1078,11 +1078,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. The builtin appraise policy appraises all files owned by uid=0. - ima_audit= [IMA] - Format: { "0" | "1" } - 0 -- integrity auditing messages. (Default) - 1 -- enable informational integrity auditing messages. - ima_hash= [IMA] Format: { "sha1" | "md5" } default: "sha1"
@@ -1107,6 +1102,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver Format: <irq> + integrity_audit=[IMA] + Format: { "0" | "1" } + 0 -- basic integrity auditing messages. (Default) + 1 -- additional integrity auditing messages. + intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option on Enable intel iommu driver.
security/integrity/Kconfig +15 -0
@@ -17,6 +17,21 @@ config INTEGRITY_SIGNATURE This is useful for evm and module keyrings, when keys are usually only added from initramfs. +config INTEGRITY_AUDIT + bool "Enables integrity auditing support " + depends on INTEGRITY && AUDIT + default y + help + In addition to enabling integrity auditing support, this + option adds a kernel parameter 'integrity_audit', which + controls the level of integrity auditing messages. + 0 - basic integrity auditing messages (default) + 1 - additional integrity auditing messages + + Additional informational integrity auditing messages would + be enabled by specifying 'integrity_audit=1' on the kernel + command line. + config INTEGRITY_ASYMMETRIC_KEYS boolean "Enable asymmetric keys support" depends on INTEGRITY_SIGNATURE
security/integrity/Makefile +1 -0
@@ -3,6 +3,7 @@ # obj-$(CONFIG_INTEGRITY) += integrity.o +obj-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o obj-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o
security/integrity/ima/Kconfig +0 -12
@@ -38,18 +38,6 @@ config IMA_MEASURE_PCR_IDX that IMA uses to maintain the integrity aggregate of the measurement list. If unsure, use the default 10. -config IMA_AUDIT - bool "Enables auditing support" - depends on IMA - depends on AUDIT - default y - help - This option adds a kernel parameter 'ima_audit', which - allows informational auditing messages to be enabled - at boot. If this option is selected, informational integrity - auditing messages can be enabled with 'ima_audit=1' on - the kernel command line. - config IMA_LSM_RULES bool depends on IMA && AUDIT && (SECURITY_SELINUX || SECURITY_SMACK)
security/integrity/ima/Makefile +0 -1
@@ -7,5 +7,4 @@ obj-$(CONFIG_IMA) += ima.o ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ ima_policy.o -ima-$(CONFIG_IMA_AUDIT) += ima_audit.o ima-$(CONFIG_IMA_APPRAISE) += ima_appraise.o
security/integrity/ima/ima.h +0 -14
@@ -62,20 +62,6 @@ struct ima_queue_entry { };extern struct list_head ima_measurements;/* list of all measurements */ -#ifdef CONFIG_IMA_AUDIT -/* declarations */ -void integrity_audit_msg (int audit_msgno,struct inode *inode, -const unsigned char *fname,const char *op, -const char *cause,int result,int info); -#else -static inline void integrity_audit_msg (int audit_msgno,struct inode *inode, -const unsigned char *fname, -const char *op,const char *cause, -int result,int info) -{ -} -#endif -/* Internal IMA function definitions */ int ima_init (void );void ima_cleanup (void );
security/integrity/ima/ima_audit.c deleted +0 -64
64 lines not on this page · raw message
security/integrity/integrity.h +14 -0
@@ -113,5 +113,19 @@ static inline int asymmetric_verify(struct key *keyring, const char *sig, }#endif +#ifdef CONFIG_AUDIT +/* declarations */ +void integrity_audit_msg (int audit_msgno,struct inode *inode, +const unsigned char *fname,const char *op, +const char *cause,int result,int info); +#else +static inline void integrity_audit_msg (int audit_msgno,struct inode *inode, +const unsigned char *fname, +const char *op,const char *cause, +int result,int info) +{ +} +#endif +/* set during initialization */ extern int iint_initialized;
security/integrity/integrity_audit.c new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
1.8.1.rc3
PATCH 3/3 evm: audit integrity metadata failures
In reply to Mimi ZoharBefore modifying an EVM protected extended attribute or any other metadata included in the HMAC calculation, the existing 'security.evm' is verified. This patch adds calls to integrity_audit_msg() to audit integrity metadata failures.
--- security/integrity/evm/evm_main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
security/integrity/evm/evm_main.c +15 -1
@@ -16,6 +16,7 @@#include <linux/module.h> #include <linux/crypto.h> +#include <linux/audit.h> #include <linux/xattr.h> #include <linux/integrity.h> #include <linux/evm.h>
@@ -24,6 +25,9 @@int evm_initialized; +static char *integrity_status_msg[] = { +"pass" ,"fail" ,"no_label" ,"no_xattrs" ,"unknown" +};char *evm_hmac ="hmac(sha1)" ;char *evm_hash ="sha1" ;int evm_hmac_version =CONFIG_EVM_HMAC_VERSION ;
@@ -262,9 +266,15 @@ static int evm_protect_xattr(struct dentry *dentry, const char *xattr_name,if ((evm_status ==INTEGRITY_PASS ) || (evm_status ==INTEGRITY_NOXATTRS ))return 0 ; -return -EPERM ; + goto out; } evm_status =evm_verify_current_integrity (dentry); +out: +if (evm_status !=INTEGRITY_PASS ) +integrity_audit_msg (AUDIT_INTEGRITY_METADATA , dentry->d_inode, + dentry->d_name.name,"appraise_metadata" , + integrity_status_msg[evm_status], + -EPERM ,0 );return evm_status ==INTEGRITY_PASS ?0 : -EPERM ; }
@@ -357,6 +367,10 @@ int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)if ((evm_status ==INTEGRITY_PASS ) || (evm_status ==INTEGRITY_NOXATTRS ))return 0 ; +integrity_audit_msg (AUDIT_INTEGRITY_METADATA , dentry->d_inode, + dentry->d_name.name,"appraise_metadata" , + integrity_status_msg[evm_status], + -EPERM ,0 );return -EPERM ; }
Signature · 1 line
1.8.1.rc3
Quoted 7 lines · Mimi Zohar
(Reposting with expanded 'cc' list.)
Included in the EVM hmac calculation is the
i_mode. Any changes to thei_modeneed to be reflected in the hmac.shmem_mknod()currently callsposix_acl_init(), which modifies thei_mode, after callingsecurity_inode_init_security(). This patch reverses the order in which they are called.
I haven't tried this with Smack, but I don't anticipate any issues.
Quoted 41 lines
Reported-by Sven Vermeulen <[email protected]>Signed-off-by Mimi Zohar <[email protected]>--- mm/shmem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)mm/shmem.c +8
-8@@ -1937,6 +1937,13 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) inode =shmem_get_inode (dir->i_sb, dir, mode, dev,VM_NORESERVE );if (inode) { +#ifdef CONFIG_TMPFS_POSIX_ACL + error =generic_acl_init (inode, dir); +if (error) { +iput (inode); +return error; + } +#endif error =security_inode_init_security (inode, dir, &dentry->d_name, shmem_initxattrs,NULL );@@ -1946,15 +1953,8 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)return error; } } -#ifdef CONFIG_TMPFS_POSIX_ACL - error =generic_acl_init (inode, dir); -if (error) { -iput (inode); -return error; - } -#else + error =0 ; -#endif dir->i_size +=BOGO_DIRENT_SIZE ; dir->i_ctime = dir->i_mtime =CURRENT_TIME ;d_instantiate (dentry, inode);
Quoted 5 lines · Mimi Zohar
(Reposting with expanded 'cc' list.)
Included in the EVM hmac calculation is the
i_mode. Any changes to thei_modeneed to be reflected in the hmac.shmem_mknod()currently callsposix_acl_init(), which modifies thei_mode, after calling
generic_acl_init()
Quoted 5 lines
security_inode_init_security(). This patch reverses the order in which they are called.Reported-by Sven Vermeulen <[email protected]>Signed-off-by Mimi Zohar <[email protected]>
Quoted 41 lines
--- mm/shmem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)mm/shmem.c +8
-8@@ -1937,6 +1937,13 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) inode =shmem_get_inode (dir->i_sb, dir, mode, dev,VM_NORESERVE );if (inode) { +#ifdef CONFIG_TMPFS_POSIX_ACL + error =generic_acl_init (inode, dir); +if (error) { +iput (inode); +return error; + } +#endif error =security_inode_init_security (inode, dir, &dentry->d_name, shmem_initxattrs,NULL );@@ -1946,15 +1953,8 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)return error; } } -#ifdef CONFIG_TMPFS_POSIX_ACL - error =generic_acl_init (inode, dir); -if (error) { -iput (inode); -return error; - } -#else + error =0 ; -#endif dir->i_size +=BOGO_DIRENT_SIZE ; dir->i_ctime = dir->i_mtime =CURRENT_TIME ;d_instantiate (dentry, inode);Signature · 1 line
1.8.1.rc3