Commit aae6ccbd authored by Mimi Zohar's avatar Mimi Zohar
Browse files

ima: rename IMA_ACTION_FLAGS to IMA_NONACTION_FLAGS 



Simple policy rule options, such as fowner, uid, or euid, can be checked
immediately, while other policy rule options, such as requiring a file
signature, need to be deferred.

The 'flags' field in the integrity_iint_cache struct contains the policy
action', 'subaction', and non action/subaction.

action: measure/measured, appraise/appraised, (collect)/collected,
        audit/audited
subaction: appraise status for each hook (e.g. file, mmap, bprm, read,
        creds)
non action/subaction: deferred policy rule options and state

Rename the IMA_ACTION_FLAGS to IMA_NONACTION_FLAGS.

Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent e4e071ba

security/integrity/ima/ima_main.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int process_measurement(struct file *file, const struct cred *cred, 
		/* reset appraisal flags if ima_inode_post_setattr was called */

		iint->flags &= ~(IMA_APPRAISE | IMA_APPRAISED |

				 IMA_APPRAISE_SUBMASK | IMA_APPRAISED_SUBMASK |

				 IMA_ACTION_FLAGS);

				 IMA_NONACTION_FLAGS);



	/*

	 * Re-evaulate the file if either the xattr has changed or the

security/integrity/ima/ima_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ int ima_match_policy(struct user_namespace *mnt_userns, struct inode *inode, 
				     func, mask, func_data))

			continue;



		action |= entry->flags & IMA_ACTION_FLAGS;

		action |= entry->flags & IMA_NONACTION_FLAGS;



		action |= entry->action & IMA_DO_MASK;

		if (entry->action & IMA_APPRAISE) {

security/integrity/integrity.h

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#define IMA_HASH		0x00000100

#define IMA_HASHED		0x00000200



/* iint cache flags */

#define IMA_ACTION_FLAGS	0xff000000

/* iint policy rule cache flags */

#define IMA_NONACTION_FLAGS	0xff000000

#define IMA_DIGSIG_REQUIRED	0x01000000

#define IMA_PERMIT_DIRECTIO	0x02000000

#define IMA_NEW_FILE		0x04000000